On Mon, Mar 12, 2018 at 2:35 PM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > Interesting. I would be tempted to resolve this inconsistency the > other way: by doing a half-hearted two-way merge (e.g. by picking one > of the two versions of the colliding file) and marking the path as > conflicted in the index. That way it's more similar to edit/edit, > too. If work is going to be done in this area, would it be possible to include making auto-merging (in general) optional? Preferably, configurable by file (or glob) but I'd already be happy with a global setting to opt out. I keep running into bugs caused by Git's automatic merging. (And I don't see how this could be improved without teaching Git the specifics of various file types.) It's especially hard when rebasing large numbers of commits. The bug is introduced early on but I will not notice anything is wrong until late in the rebase. (Since I seem to keep asking for things that turn out to already have been implemented ... if this is already possible please just point me to the right setting and consider me a happy camper. :-) )
