From: Felipe Contreras Date: Sat, 03 May 2014 11:30:26 GMT Subject: Re: Pull is Mostly Evil Message-ID: <5364d3528eb93_14419272f03@nysa.notmuch> In-Reply-To: <8F49068316F64566954C5D037C512704@PhilipOakley> Philip Oakley wrote: > From: "Felipe Contreras" > > When doing something is better for the vast majority of people, that's > > what should be done by default, unless the results are catastrophic > > for > > the minority. > > > > Since doing something is not catastrophic to the minority, it follows > > that the default should be to do something. > > It's a simple as that. > > ... which makes it not quite as simple as that ;-) [evidence: the > ongoing dialog among all and sundry] The dialog is not simple becuase it's not easy to make `git pull` do the sensible thing. That doesn't mean `git pull` should do *nothing*, that doesn't follow from the argument above. -- Felipe Contreras