From: David Kastrup Date: Fri, 28 Feb 2014 14:21:39 GMT Subject: Re: [RFC 0/3] Make git more user-friendly during a merge conflict Message-ID: <87txbj1fnw.fsf@fencepost.gnu.org> In-Reply-To: <858usvz5nj.fsf@stephe-leake.org> Stephen Leake writes: > David Kastrup writes: > >> "do the right thing" commands also tend to do the wrong thing >> occasionally with potentially disastrous results when they are used >> in scripts where the followup actions rely on the actual result. > > That is bad, and should not be allowed. On the other hand, I have yet > to see an actual use case of bad behavior in this discussion. Huh. -- David Kastrup