From: Fabien Dubail <fabien.dubail@labage.be>
To: git@vger.kernel.org
Subject: git merge
Date: Tue, 20 Mar 2012 10:47:35 +0100 [thread overview]
Message-ID: <4F685237.5060402@labage.be> (raw)
Hi,
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?
Thanks
Fabien
next reply other threads:[~2012-03-20 11:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-20 9:47 Fabien Dubail [this message]
2012-03-20 23:49 ` git merge Neal Kreitzinger
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F685237.5060402@labage.be \
--to=fabien.dubail@labage.be \
--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.