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

sync: Fix automatic resolution of merge conflicts where one side is an annexed file, and the other side is a non-annexed file, or a directory.

Browse source 
Note that this case is only fully automatically resolved in direct mode.
In indirect mode, git merge moves the file to file~HEAD, and replaces it
with the directory, and leaves the file in unmerged state, and sync doesn't
yet change that.
This commit is contained in:
Joey Hess 2013-10-16 14:48:51 -04:00
parent 6fb6913168
commit e227e8f683
2 changed files with 48 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -23,6 +23,8 @@ git-annex (4.20131003) UNRELEASED; urgency=low
* Deal with git check-attr -z output format change in git 1.8.5.
* Work around sed output difference that led to version containing a newline
on OSX.
* sync: Fix automatic resolution of merge conflicts where one side is an
annexed file, and the other side is a non-annexed file, or a directory.
-- Joey Hess <joeyh@debian.org> Thu, 03 Oct 2013 15:41:24 -0400