From 3eeba159f25cd53773c48d131cae796b366a43a4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Jun 2014 17:43:49 -0400 Subject: harder --- doc/bugs/direct_mode_merge_interrupt.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') 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]] -- cgit v1.2.3