From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: geoffrey.russell@gmail.com, sverre@rabbelier.nl,
Johannes Sixt <j.sixt@viscovery.net>,
Miklos Vajna <vmiklos@frugalware.org>,
git@vger.kernel.org
Subject: Re: Guided merge with override
Date: Wed, 18 Jun 2008 16:28:42 +0100 (BST) [thread overview]
Message-ID: <alpine.DEB.1.00.0806181627260.6439@racer> (raw)
In-Reply-To: <alpine.DEB.1.00.0806181618070.6439@racer>
Hi,
On Wed, 18 Jun 2008, Johannes Schindelin wrote:
> On Tue, 17 Jun 2008, Junio C Hamano wrote:
>
> > No, neither --theirs nor --ours option exists in your version of git.
> > But here is a patch to add it to git-merge-file.
>
> Looks good, thanks! Just to be safe, this should be accompanied by tet
> cases. But I did not see anything wrong with the patch.
Thinking about this again, there could be a problem: in case of complex
merges, it is possible that the sides are switched around for an
intermediate merge. IOW you'd expect it to take "theirs", but it really
takes "ours".
Hrm.
Ciao,
Dscho
next prev parent reply other threads:[~2008-06-18 15:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-16 4:16 Guided merge with override Geoff Russell
2008-06-16 9:25 ` Miklos Vajna
2008-06-16 10:16 ` Johannes Sixt
2008-06-16 21:16 ` Miklos Vajna
2008-06-16 22:21 ` Sverre Rabbelier
2008-06-16 22:45 ` Geoff Russell
2008-06-17 20:04 ` Junio C Hamano
2008-06-18 15:19 ` Johannes Schindelin
2008-06-18 15:28 ` Johannes Schindelin [this message]
2008-06-18 16:31 ` Junio C Hamano
2008-06-18 19:29 ` Johannes Schindelin
2008-06-20 7:38 ` [PATCH 1/2] git-merge-file --ours, --theirs Junio C Hamano
2008-06-20 7:48 ` [PATCH 2/2] git-merge-recursive-{ours,theirs} Junio C Hamano
2008-06-20 12:58 ` Johannes Schindelin
2008-06-21 9:46 ` Junio C Hamano
2008-06-21 16:29 ` Johannes Schindelin
2008-06-21 16:56 ` Jakub Narebski
2008-06-17 6:16 ` Guided merge with override Johannes Sixt
2008-06-17 8:53 ` Sverre Rabbelier
2008-06-17 9:48 ` Johannes Schindelin
2008-06-17 9:53 ` Sverre Rabbelier
2008-06-17 10:17 ` Johannes Schindelin
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=alpine.DEB.1.00.0806181627260.6439@racer \
--to=johannes.schindelin@gmx.de \
--cc=geoffrey.russell@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=sverre@rabbelier.nl \
--cc=vmiklos@frugalware.org \
/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