From: Markus Elfring <Markus.Elfring@web.de>
To: git@vger.kernel.org
Subject: Re: Challenges for an octopus merge
Date: Fri, 08 Apr 2011 17:27:47 +0200 [thread overview]
Message-ID: <4D9F2973.2090400@web.de> (raw)
In-Reply-To: <4D53F694.1060105@web.de>
> Automatic merge failed; fix conflicts and then commit the result.
I would appreciate if the implementations of merge procedures could be improved
so that work results like the following can be achieved in an easier way.
https://github.com/elfring/BtYacc/tree/route1
Can any documentation updates help in this use case, too?
Regards,
Markus
prev parent reply other threads:[~2011-04-08 15:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-10 14:30 Challenges for an octopus merge Markus Elfring
2011-02-10 16:09 ` Junio C Hamano
2011-02-11 16:23 ` Markus Elfring
2011-02-11 18:22 ` Junio C Hamano
2011-02-12 4:50 ` Markus Elfring
2011-02-15 17:29 ` Markus Elfring
2011-04-08 15:27 ` Markus Elfring [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=4D9F2973.2090400@web.de \
--to=markus.elfring@web.de \
--cc=git@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.