Clemens Buchacher <drizzd@xxxxxx> writes: > I strongly disagree. With the suggested behavior I would have to > double-check every single untracked file in my tree for conflicts before > trying a throw-away merge followed by git reset --hard, for example. AFAICS, that's not "suggested behaviour" for merge, but it is the behaviour that has been true for eternity. You can suggest to fix "reset --hard", though. -- 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
