git-annex/doc/bugs/automerge_leaves_cruft_behind.mdwn

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

Seems to only happen sometimes, unsure why.. Maybe git doesn't always
write those files, or sometimes something done with git deletes them?

Root cause seems to be that it's making an InodeCache, but that can't
be done of a broken symlink. So, it's probably a reversion introduced with
v7 unlocked files or so.

> [[fixed|done]] --[[Joey]]
revert change that broke test suite Opened a new bug about it. This commit was sponsored by Ethan Aubin. 2020-09-07 19:41:16 +00:00			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.`

resolvemerge: Improve cleanup of cruft left in the working tree by a conflicted merge This commit was sponsored by Jake Vosloo on Patreon. 2020-09-07 20:50:27 +00:00			`Also happens with merge.directoryRenames=conflict`

			`Seems to only happen sometimes, unsure why.. Maybe git doesn't always`
			`write those files, or sometimes something done with git deletes them?`

			`Root cause seems to be that it's making an InodeCache, but that can't`
			`be done of a broken symlink. So, it's probably a reversion introduced with`
			`v7 unlocked files or so.`

			`> [[fixed\|done]] --[[Joey]]`