From: Loic Dachary <loic@dachary.org>
To: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Cc: Ceph Development <ceph-devel@vger.kernel.org>
Subject: Merging hammer in master: conflict on gmock
Date: Mon, 09 Mar 2015 15:18:40 +0100 [thread overview]
Message-ID: <54FDABC0.4080803@dachary.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 283 bytes --]
Hi Danny,
As of now, git checkout master ; git merge origin/hammer gets a conflict on gmock
When we last discussed it you found that git merge -m 1 was a solution. But I'm not sure I fully understand the consequences.
Cheers
--
Loïc Dachary, Artisan Logiciel Libre
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2015-03-09 14:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-09 14:18 Loic Dachary [this message]
2015-03-09 17:31 ` Merging hammer in master: conflict on gmock Danny Al-Gaaf
2015-03-09 23:06 ` Loic Dachary
2015-03-10 5:59 ` Danny Al-Gaaf
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=54FDABC0.4080803@dachary.org \
--to=loic@dachary.org \
--cc=ceph-devel@vger.kernel.org \
--cc=danny.al-gaaf@bisect.de \
/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.