From: Joey Hess Date: Tue, 2 Jan 2024 18:08:01 +0000 (-0400) Subject: comment X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~29^2~67 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bcbad66cf3d9a2f5a390b89eb689bcab7b0168ab;p=git-annex.git comment --- diff --git a/doc/bugs/No_way_to_merge_conflicts_while_on_adjusted_branch/comment_1_77c241c5d61b62b1fae552145c6c94ef._comment b/doc/bugs/No_way_to_merge_conflicts_while_on_adjusted_branch/comment_1_77c241c5d61b62b1fae552145c6c94ef._comment new file mode 100644 index 0000000000..3a2e141757 --- /dev/null +++ b/doc/bugs/No_way_to_merge_conflicts_while_on_adjusted_branch/comment_1_77c241c5d61b62b1fae552145c6c94ef._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2024-01-02T18:05:47Z" + content=""" +git is what's doing the automatic merge, using the merge driver that you +configured. Is the file `study.org` an annexed file? If not, I don't really +see how this involves git-annex. git doesn't care if an adjusted branch is +checked out or not, when using a merge driver to merge a non-annexed file. + +It looks like your merge driver is perhaps not working.. +"""]]