From: Junio C Hamano <gitster@pobox.com>
To: "Richard Hartmann" <richih.mailinglist@gmail.com>
Cc: git@vger.kernel.org, markus.heidelberg@web.de
Subject: Re: Conflict-free merging (i.e. concat) of conflicting branches?
Date: Sun, 16 Nov 2008 08:28:31 -0800 [thread overview]
Message-ID: <7viqqn4ouo.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <2d460de70811160550g75e50e00gb50d3b2045c460af@mail.gmail.com> (Richard Hartmann's message of "Sun, 16 Nov 2008 14:50:34 +0100")
"Richard Hartmann" <richih.mailinglist@gmail.com> writes:
> The question is if there is a way to to merge these
> branches in a way that is conflict-free and includes
> all lines. Obviously, the order of the lines is irrelevant
> and can be random.
gitattributes(5) and look for "union"?
next prev parent reply other threads:[~2008-11-16 16:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-16 13:50 Conflict-free merging (i.e. concat) of conflicting branches? Richard Hartmann
2008-11-16 14:19 ` Samuel Tardieu
2008-11-16 21:43 ` Richard Hartmann
2008-11-16 16:28 ` Junio C Hamano [this message]
2008-11-16 21:44 ` Richard Hartmann
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=7viqqn4ouo.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=markus.heidelberg@web.de \
--cc=richih.mailinglist@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).