From: Junio C Hamano <junkio@cox.net>
To: Pavel Roskin <proski@gnu.org>
Cc: git@vger.kernel.org
Subject: Re: Merge with local conflicts in new files
Date: Wed, 17 May 2006 01:20:22 -0700 [thread overview]
Message-ID: <7v4pzpjc55.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <1147852052.31879.50.camel@dv> (Pavel Roskin's message of "Wed, 17 May 2006 03:47:32 -0400")
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?
next prev parent reply other threads:[~2006-05-17 8:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-16 22:00 Merge with local conflicts in new files Santi
2006-05-16 22:12 ` Santi
2006-05-16 22:40 ` Junio C Hamano
2006-05-16 23:11 ` Santi
2006-05-16 23:28 ` Junio C Hamano
2006-05-17 7:47 ` Pavel Roskin
2006-05-17 8:20 ` Junio C Hamano [this message]
2006-05-17 8:50 ` Martin Langhoff
2006-05-17 8:17 ` [PATCH/RFC] read-tree -m -u: do not overwrite or remove untracked working tree files Junio C Hamano
2006-05-17 8:24 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v4pzpjc55.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=proski@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).