All of lore.kernel.org
 help / color / mirror / Atom feed
From: Markus Elfring <Markus.Elfring@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Challenges for an octopus merge
Date: Sat, 12 Feb 2011 05:50:16 +0100	[thread overview]
Message-ID: <4D561188.4000109@web.de> (raw)
In-Reply-To: <7vd3my1leq.fsf@alter.siamese.dyndns.org>

> The user needs to decide what to do next; the user may choose to do "git merge A C ; git merge B" instead,
> but *after* inspecting the situation.

I have inspected my situation a bit more. I hope that the merging process can be 
improved so that it can cope with my update suggestions here.

Would anybody (besides me) like to look into the affected patches and source 
files if the tool "Git" can provide a better service?

Does it make sense to add these files to your test-suite?

Regards,
Markus

  reply	other threads:[~2011-02-12  4:51 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 [this message]
2011-02-15 17:29       ` Markus Elfring
2011-04-08 15:27 ` Markus Elfring

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=4D561188.4000109@web.de \
    --to=markus.elfring@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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 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.