From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri, 02 May 2014 00:31:41 GMT
Subject: Re: Pull is Evil
Message-ID: <5362e76d5169_429131b31093@nysa.notmuch>
In-Reply-To: <20140501235933.GA28634@odin.tremily.us>

W. Trevor King wrote:
> On Thu, May 01, 2014 at 06:34:06PM -0500, Felipe Contreras wrote:
> > Nobody ever complained about somebody doing a fast-forward by mistake.
> 
> Unless they fast-forward merged a feature branch into master, but the
> project prefers explicitly-merged feature branches with a cover-letter
> explaination in the merge commit [1].  On the one hand, folks
> integrating feature branches are likely more experienced Git users.

Exactly. That's barely an issue.

> I agree that accidental ff-merges are likely to be less troublesome
> than accidental non-ff merge/rebases, but I don't think changing the
> default to ff-only is a perfect fix.

I don't see what else we could do.

-- 
Felipe Contreras