git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lynn Lin <lynn.xin.lin@gmail.com>
To: git@vger.kernel.org
Subject: git merge successfully however this is still issue from logical perspective
Date: Wed, 26 Oct 2011 20:08:11 +0800	[thread overview]
Message-ID: <CAPgpnMSSOss=YxsMUZJ3E5TynDfHJG1i6PKitLBo_Tm7f=_+fQ@mail.gmail.com> (raw)

Hi all,
   Do this case can happen? When I do merge from one branch to master
branch,merge successfully however from code logical perspective it
fails and It cause code compile (our project is using C++ language)


Thanks
Lynn

             reply	other threads:[~2011-10-26 12:08 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-26 12:08 Lynn Lin [this message]
2011-10-26 12:27 ` git merge successfully however this is still issue from logical perspective Thomas Rast
2011-10-26 12:29   ` Lynn Lin
2011-10-26 12:39     ` Thomas Rast

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='CAPgpnMSSOss=YxsMUZJ3E5TynDfHJG1i6PKitLBo_Tm7f=_+fQ@mail.gmail.com' \
    --to=lynn.xin.lin@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).