]> dgit.raspbian.org Git - git-annex.git/commitdiff
comment
authorJoey Hess <joeyh@joeyh.name>
Thu, 9 Dec 2021 18:43:10 +0000 (14:43 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 9 Dec 2021 18:43:10 +0000 (14:43 -0400)
doc/bugs/merge-annex-branches__61__false_-_automate_and_extend/comment_4_497bbe4e351a66731c920ca5a2048c92._comment [new file with mode: 0644]

diff --git a/doc/bugs/merge-annex-branches__61__false_-_automate_and_extend/comment_4_497bbe4e351a66731c920ca5a2048c92._comment b/doc/bugs/merge-annex-branches__61__false_-_automate_and_extend/comment_4_497bbe4e351a66731c920ca5a2048c92._comment
new file mode 100644 (file)
index 0000000..dc1c7a8
--- /dev/null
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 4"""
+ date="2021-12-09T18:38:54Z"
+ content="""
+Yes, it seems like annex.merge-annex-branches=false should prevent it
+looking at unmerged sibling branches. Since it would be effectively
+doing an in-memory merge.
+"""]]