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

harder

Browse source
This commit is contained in:
Joey Hess 2014-06-09 17:43:49 -04:00
parent 920794ab6b
commit 193e702d73
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/bugs/direct_mode_merge_interrupt.mdwn
View file

@ -19,3 +19,8 @@ branch when merging the remote branch into it (how?). It should first
update the whole work tree, and only after it's updated should it update update the whole work tree, and only after it's updated should it update
the current branch to reflect the merge. (I assume this is how `git merge` the current branch to reflect the merge. (I assume this is how `git merge`
normally works.) --[[Joey]] normally works.) --[[Joey]]
> Implemented that. And then realized that even updating the index
> as part of a merge results in the work tree being out of sync with the
> index. Which will cause the next sync to again delete any files that
> are in the index but not the work tree. Urgh. --[[Joey]]