From: Johannes Schindelin Date: Thu, 08 Nov 2007 15:27:15 GMT Subject: Re: git pull opinion Message-ID: In-Reply-To: <3abd05a90711071325y397434efq7d4e50cb7a1cf07e@mail.gmail.com> Hi, On Wed, 7 Nov 2007, Aghiles wrote: > On 11/6/07, Linus Torvalds wrote: > > > Now, I do think that we could relax the rule so that "files that are > > modified must be clean in the working tree" could instead become > > "files that actually don't merge _trivially_ must be clean in the > > working tree". But basically, if it's not a trivial merge, then since > > it's done in the working tree, the working tree has to be clean (or > > the merge would overwrite it). > > I really think this is a good idea. It seems to me that the first "bad" > surprise a svn/cvs/bk user will have is the result of a "git pull" command > on a dirty tree. With the proposed change, and if I understand correctly: > - users that are used to commit often and fetch into clean trees > will never be bothered by this change. > - users that are used to "update" often are expecting to resolve > conflicts in their working copy anyway. But the latter ones will likely not understand why all of a sudden their working tree has to be clean sometimes (when there was no trivial merge possible). Besides, I think it is not trivial to implement. Not my itch, Dscho