From: Junio C Hamano Date: Mon, 10 Oct 2011 15:23:18 GMT Subject: Re: [PATCH v2] Teach merge the '[-e|--edit]' option Message-ID: <7vmxd8oopl.fsf@alter.siamese.dyndns.org> In-Reply-To: Jakub Narebski writes: > Yet another issue is if we should blindly trust automatic merge resolution. > It is considered a good practice by some to always check (e.g. by compiling > and possibly also running tests) the result of merge, whether it required > merge conflict resolution or not. > > IIRC Linus lately said that making "git merge" automatically commit > was one of bad design decisions of git, for the above reason... I think your recalling this discussion http://thread.gmane.org/gmane.linux.kernel/1191100/focus=181362 While I agree with what Linus said in the message, I think you are not remembering the discussion correctly. It was about bad commit _message_, and an improvement is not to let users tweak a cleanly automerged result, but is to allow users or force them to always write their own message, perhaps with "merge --[no-]edit", which is exactly the point of Jay's patch in this thread.