Junio C Hamano writes: > * jc/3way (Wed Nov 29 18:53:13 2006 -0800) 1 commit > + git-merge: preserve and merge local changes when doing fast > forward > > A few people wanted to have this in v1.5.0, but I am a bit > reluctant to do so --- I think the behaviour of its failure mode > is rather nasty, even though it tries to help the user by > dropping the local diff in .git/LOCAL_DIFF file. It happened to me (not really an experienced user) for the first time on the last pull. Though unexpected it wasn't an unpleasant experience. The failure mode doesn't feel smooth, but after thinking about possible improvements I couldn't come up with anything better. It already states explicitly what it's doing including telling the user about LOCAL_DIFF. The only thing I wasn't sure about was how to get rid of the unmerged index entries after I fixed the conflicts without adding the local change to the index. In the end I did an update-index/reset combination, but perhaps repeating the list of files with conflicting local changes after the merge and cleaning the index instead of leaving unmerged entries in the index would be better. I think (because of LOCAL_DIFF) it is safe to have this in 1.5 even in its current incarnation. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html