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

needs merge

From
Len Brown <len.brown@intel.com>
Date
Jan 7, 2006, 08:32 UTC
Message-ID
<200601070332.36654.len.brown@intel.com>
a merge results in multiple conflict files.
some of the files are resolved by editing and picking changes from both branches.

but some files I want to ignore the new changes and keep what was originally there. However, if I restore what was originally in the destination either by editing the destination and ending up with what i started with, or via git checkout on the file, i get

$ git commit my-file needs merge

how do i tell git that there is no merge to do and the (unchanged) working file is what i want to keep as the result of the merge?

i recall running into this a long time ago and i added blank line to the destination file and that made git happy, but maybe i shouldn't have to resort to that, yes?

thanks, -Len

Next: Junio C Hamano
Message 1 of 4 in “needs merge”
  1. Len BrownJan 7, 2006
  2. Junio C HamanoJan 7, 2006
  3. Len BrownJan 7, 2006
  4. Junio C HamanoJan 7, 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.