From: Neal Kreitzinger <nkreitzinger@gmail.com>
To: git@vger.kernel.org
Cc: git@vger.kernel.org
Subject: Re: git merge
Date: Tue, 20 Mar 2012 18:49:48 -0500 [thread overview]
Message-ID: <4F69179C.3030808@gmail.com> (raw)
In-Reply-To: <4F685237.5060402@labage.be>
On 3/20/2012 4:47 AM, Fabien Dubail wrote:
>
> I've conflicts when I merge branches. I can resolve some conflicts but
> not all. The remaining conflicts will be solved by someone else?
> To do that I would like to merge only some files and resolve 'my'
> conflicts. (something like: 'git checkout branch files' but with merge)
> Than remaining files will be merged by someone else and remaining
> conflicts will be resolved .
> Is-it possible to do that with git and how? Or is there an other way?
>
One way you can do it is to create a branch containing your resolutions.
Then the other person pulls your branch. They would redo the merge on
their own branch and checkout your resolutions to apply your work, and
resolve the remainder himself. This could go on for mutltiple people.
You can edit the merge commit message to document who resolved which
conflicts.
Maybe someone has a better way. We did a "distributed merge" this way.
I pulled everyone else's branches containing their resolutions and
then redid the merge and checkout out their resolutions from their
branches and resolved my portion assigned to me personally. Actually, I
think I did mine in a separate branch and then when all were done I
redid the merge and checked out out everyone's portions from their
respective branches (including mine) to accomplish the distributed merge
(merge conflict resolution). (In our case, we were actually doing
git-rebase "merge", but I think it would work for git-merge also.)
Maybe someone else has a better way.
v/r,
neal
next prev parent reply other threads:[~2012-03-20 23:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-20 9:47 git merge Fabien Dubail
2012-03-20 23:49 ` Neal Kreitzinger [this message]
2012-03-20 23:50 ` Neal Kreitzinger
-- strict thread matches above, loose matches on Subject: below --
2005-04-14 0:29 Merge with git-pasky II Petr Baudis
2005-04-14 22:11 ` git merge Petr Baudis
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F69179C.3030808@gmail.com \
--to=nkreitzinger@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).