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

Re: Merge with local conflicts in new files

From
SSanti <sbejar@gmail.com>
Date
May 16, 2006, 23:11 UTC
Message-ID
<8aa486160605161611p4c9ddbc0v@mail.gmail.com>
In-Reply-To
<7v1wut61aj.fsf@assigned-by-dhcp.cox.net>
2006/5/17, Junio C Hamano <junkio@cox.net>:
Show 11 quoted lines
> Santi <sbejar@gmail.com> writes:
>
> >       In the case of:
> >
> > - You merge from a branch with new files
> > - You have these files in the working directory
> > - You do not have these files in the HEAD.
>
> and
>
>  - You have not told git that these files matter.

For me it is the other way, all my files matter but git can do whatever it wants with the ones it controls.

>
> This is totally untested, but on top of "next" you could do
> something like this, perhaps.
Thanks, it works here.
Santi
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 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.