From: Junio C Hamano <junkio@cox.net>
Date: Wed, 17 May 2006 08:20:22 GMT
Subject: Re: Merge with local conflicts in new files
Message-ID: <7v4pzpjc55.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <1147852052.31879.50.camel@dv>

Pavel Roskin <proski@gnu.org> writes:

> I'm afraid this approach, while understandable from the technical
> standpoint, could prevent git from ever becoming a version control
> system that "just works" without any porcelains.
>
> I know a person who refuses to use any version control.  If he
> encountered this situation, he would never try any version control
> again.
>
> After all, we are talking about files in the _working_ directory.  It's
> not merely a transient appendix to the repository.  git is not the only
> player here.  If a file doesn't "belong" to git, it belongs to its
> "supreme commander", i.e. the user, and should be approached with utmost
> care.

I am biased ;-) and appreciate corrections like this.  How does
the updated patch I just sent out look?