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

Re: more merge strategies : feature request

From
LRLeo Razoumov <slonik.az@gmail.com>
Date
Dec 3, 2008, 01:07 UTC
Message-ID
<ee2a733e0812021707i82049eai866035aef3386264@mail.gmail.com>
In-Reply-To
<81bfc67a0812020546o79906a20jcd04bd42d18dd803@mail.gmail.com>
On 12/2/08, Caleb Cushing <xenoterracide@gmail.com> wrote:
Show 12 quoted lines
> > I guess that "no-overwrite" can be achieved by
>  >
>  >  git merge -s ours --no-commit
>
>
> no it doesn't. which is why I called it a bad name. no-overwrite would
>  still add new lines to the file not in ours (and no-commit isn't
>  needed in that case) it just wouldn't overwrite conflicting lines, my
>  understanding of ours is that it will keep the files as is.
>
> Caleb Cushing
>
>From your original email in this thread

"no-overwrite: if a change from the branch being merged in would overwrite something in the current branch don't merge it. (I think it needs a better name)"

I got the impression that you would like to preserve "ours" branch whenever other branch tries to overwrite something? Is it "no-override-conflicting-lines" that you are really after?

--Leo--
Previous: Caleb CushingNext: Nanako Shiraishi
Message 9 of 13 in “more merge strategies : feature request”
  1. Caleb CushingNov 29, 2008
  2. Andreas EricssonDec 1, 2008
  3. Caleb CushingDec 2, 2008
  4. Jeff KingDec 2, 2008
  5. Caleb CushingDec 2, 2008
  6. Jeff KingDec 2, 2008
  7. Leo RazoumovDec 2, 2008
  8. Caleb CushingDec 2, 2008
  9. Leo RazoumovDec 3, 2008
  10. Nanako ShiraishiDec 3, 2008
  11. Caleb CushingDec 3, 2008
  12. Junio C HamanoDec 4, 2008
  13. Nanako ShiraishiDec 4, 2008

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.