From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri, 02 May 2014 19:05:23 GMT
Subject: Re: Pull is Mostly Evil
Message-ID: <5363ec734572a_70ef0f30cdc@nysa.notmuch>
In-Reply-To: <C439C0C76DA44AB5AAC91E7C0D2991BA@PhilipOakley>

Philip Oakley wrote:
> From: "David Kastrup" <dak@gnu.org>
> > Marc Branchaud <marcnarc@xiplink.com> writes:
> >
> >> To that end, I suggest that pull's default behaviour should be to do
> >> *nothing*.  It should just print out a message to the effect that it
> >> hasn't been configured, and that the user should run "git help pull"
> >> for guidance.
> >
> > Fetching is uncontentious, and I _think_ that fast-forwards are pretty
> > uncontentious as well.
> 
> While the fast forward is /pretty/ uncontentious, it still maybe 
> contentious for some.

So? No defaults can please absolutely everyone, the best anybody can do
is try to please the majority of people, and merging fast-forwards only
does that.

-- 
Felipe Contreras