From a40e203f23a87bbc6d362d33734f1e4dcf645871 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 16 Oct 2013 14:48:51 -0400 Subject: 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. 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. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d2234d810..67aae5e2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Thu, 03 Oct 2013 15:41:24 -0400 -- cgit v1.2.3