diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-06-09 17:43:49 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-09 17:43:49 -0400 |
| commit | 3eeba159f25cd53773c48d131cae796b366a43a4 (patch) | |
| tree | 472e44158ea48f1fb48679f8e58e0b4e655687b1 | |
| parent | f890523aca9186d40a210d64e29137ad2292ac2a (diff) | |
harder
| -rw-r--r-- | doc/bugs/direct_mode_merge_interrupt.mdwn | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/bugs/direct_mode_merge_interrupt.mdwn b/doc/bugs/direct_mode_merge_interrupt.mdwn index a3b640a8c..50b32929b 100644 --- a/doc/bugs/direct_mode_merge_interrupt.mdwn +++ b/doc/bugs/direct_mode_merge_interrupt.mdwn @@ -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 the current branch to reflect the merge. (I assume this is how `git merge` 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]] |