mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

comment

Browse source
This commit is contained in:
Joey Hess 2024-01-02 14:08:01 -04:00
parent 2b8d081b60
commit bcbad66cf3
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/bugs/No_way_to_merge_conflicts_while_on_adjusted_branch/comment_1_77c241c5d61b62b1fae552145c6c94ef._comment Normal file
View file

@ -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..
"""]]