From: Alex Riesen <raa.lkml@gmail.com>
To: git@vger.kernel.org
Subject: Re: Cherry picking instead of merges.
Date: Thu, 3 Jul 2008 22:13:54 +0200 [thread overview]
Message-ID: <20080703201354.GA3546@steel.home> (raw)
In-Reply-To: <20080703182650.GA11166@old.davidb.org>
David Brown, Thu, Jul 03, 2008 20:26:50 +0200:
> Yesterday, one developer cherry picked company B's changes into a branch.
> It appears he resolved the conflicts for each commit, which should make
> bisecting easier.
>
> The problem is that we now have very divergent history.
...and have absolutely no idea on what were the changes of the company
B were made.
> Any advice on how to make use of how he resolved conflicts in order to
> merge company B's changes in using git-merge. ...
Let that developer do the merge next time? Or let the B do a merge
with a commonly accepted base?
next prev parent reply other threads:[~2008-07-03 20:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-03 18:26 Cherry picking instead of merges David Brown
2008-07-03 20:13 ` Alex Riesen [this message]
2008-07-03 20:15 ` Avery Pennarun
2008-07-03 20:53 ` David Brown
2008-07-03 21:18 ` Samuel Tardieu
2008-07-03 21:18 ` Linus Torvalds
2008-07-03 22:39 ` David Brown
2008-07-04 0:10 ` Björn Steinbrink
2008-07-04 4:40 ` David Brown
2008-07-04 5:30 ` Linus Torvalds
2008-07-04 6:36 ` Johannes Sixt
2008-07-04 16:47 ` Linus Torvalds
2008-07-04 0:39 ` Linus Torvalds
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=20080703201354.GA3546@steel.home \
--to=raa.lkml@gmail.com \
--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 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).