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

revert change that broke test suite

Browse source 
Opened a new bug about it.

This commit was sponsored by Ethan Aubin.
This commit is contained in:
Joey Hess 2020-09-07 15:41:16 -04:00
parent e88ab0c09d
commit 03dee56546
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 13 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/bugs/automerge_leaves_cruft_behind.mdwn Normal file
View file

@ -0,0 +1,6 @@
Seeing `git-annex sync` after resolving a merge conflict between a
directory and an annexed file leave behind
files like `foo~refs_remotes_origin_master`, which are not checked into
git.
Also happens with merge.directoryRenames=conflict --[[Joey]]