git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Merge with local conflicts in new files

From
Junio C Hamano <junkio@cox.net>
Date
May 17, 2006, 08:20 UTC
Message-ID
<7v4pzpjc55.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<1147852052.31879.50.camel@dv>
Pavel Roskin <proski@gnu.org> writes:
Show 13 quoted lines
> 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?

Previous: Pavel RoskinNext: Martin Langhoff
Message 7 of 10 in “Merge with local conflicts in new files”
  1. SantiMay 16, 2006
  2. SantiMay 16, 2006
  3. Junio C HamanoMay 16, 2006
  4. SantiMay 16, 2006
  5. Junio C HamanoMay 16, 2006
  6. Pavel RoskinMay 17, 2006
  7. Junio C HamanoMay 17, 2006
  8. Martin LanghoffMay 17, 2006
  9. read-tree -m -u: do not overwrite or remove untracked working tree files.Junio C Hamano, May 17, 2006
  10. Jakub NarebskiMay 17, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.