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

Re: Git pull --rebase with strategy ours doesn't work (possibly bug)

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 13, 2011, 15:01 UTC
Message-ID
<7v8vt5rd0u.fsf@alter.siamese.dyndns.org>
In-Reply-To
<BANLkTi=jLQf6Wp-qqYoy7kND2M1=WRyxXg@mail.gmail.com>
"Dmitry S. Kravtsov" <idkravitz@gmail.com> writes:
> and from git-rebase man page I read, that strategy ours allows us to
> discard conflicing changes in favor
> of ours.

That is not what the "ours" strategy is about. When merging another history into our history, the strategy marks the other history "merged" while using our tree as the result of the merge, without using _anything_ from their history.

It is not a way to take whatever that happen to merge cleanly textually but use our change in only the conflicting parts. You are probably confusing it with 'ours' option of the recursive strategy, that is used in "git merge -Xours".

Previous: Dmitry S. Kravtsov
Message 5 of 5 in “Git pull --rebase with strategy ours doesn't work (possibly bug)”
  1. Dmitry S. KravtsovJun 13, 2011
  2. Dmitry S. KravtsovJun 13, 2011
  3. Dmitry S. KravtsovJun 13, 2011
  4. Dmitry S. KravtsovJun 13, 2011
  5. Junio C HamanoJun 13, 2011

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.