From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
To: Loic Dachary <loic@dachary.org>
Cc: Ceph Development <ceph-devel@vger.kernel.org>
Subject: Re: Merging hammer in master: conflict on gmock
Date: Tue, 10 Mar 2015 06:59:18 +0100 [thread overview]
Message-ID: <54FE8836.6040308@bisect.de> (raw)
In-Reply-To: <54FE2775.8010608@dachary.org>
Am 10.03.2015 um 00:06 schrieb Loic Dachary:
>
>
> On 09/03/2015 18:31, Danny Al-Gaaf wrote:
>> Hi Loic,
>>
>> this one is a tricky one. I didn't find a smooth/automatic
>> solution yet.
>>
>> This seems to work:
>>
>> git checkout master git merge --no-ff origin/hammer git
>> mergetool -> for the conflict: select 'local' for src/gmock (this
>> should keep the changes im master and ignore changes from
>> hammer)
>
> Do you know what changes have been done in hammer in src/gmock ?
It seems as if there was no change to src/gmock in hammer that is not
already in master.
Danny
next prev parent reply other threads:[~2015-03-10 5:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-09 14:18 Merging hammer in master: conflict on gmock Loic Dachary
2015-03-09 17:31 ` Danny Al-Gaaf
2015-03-09 23:06 ` Loic Dachary
2015-03-10 5:59 ` Danny Al-Gaaf [this message]
2015-03-10 8:02 ` Loic Dachary
2015-03-10 11:07 ` Danny Al-Gaaf
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=54FE8836.6040308@bisect.de \
--to=danny.al-gaaf@bisect.de \
--cc=ceph-devel@vger.kernel.org \
--cc=loic@dachary.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.