From: Junio C Hamano <gitster@pobox.com>
To: "Dmitry S. Kravtsov" <idkravitz@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Git pull --rebase with strategy ours doesn't work (possibly bug)
Date: Mon, 13 Jun 2011 08:01:37 -0700 [thread overview]
Message-ID: <7v8vt5rd0u.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <BANLkTi=jLQf6Wp-qqYoy7kND2M1=WRyxXg@mail.gmail.com> (Dmitry S. Kravtsov's message of "Mon, 13 Jun 2011 14:05:31 +1100")
"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".
prev parent reply other threads:[~2011-06-13 15:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-13 3:05 Git pull --rebase with strategy ours doesn't work (possibly bug) Dmitry S. Kravtsov
2011-06-13 3:21 ` Dmitry S. Kravtsov
2011-06-13 3:41 ` Dmitry S. Kravtsov
2011-06-13 3:50 ` Dmitry S. Kravtsov
2011-06-13 15:01 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v8vt5rd0u.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=idkravitz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).