git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git merge successfully however this is still issue from logical perspective

From
Thomas Rast <trast@student.ethz.ch>
Date
Oct 26, 2011, 12:27 UTC
Message-ID
<201110261427.03585.trast@student.ethz.ch>
In-Reply-To
<CAPgpnMSSOss=YxsMUZJ3E5TynDfHJG1i6PKitLBo_Tm7f=_+fQ@mail.gmail.com>
Lynn Lin wrote:
> 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)

Sure. The easiest example is when one side of a merge renames foo() to bar(), while the other side introduces another call to foo() in an unrelated part of the code.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch
Previous: Lynn LinNext: Lynn Lin
Message 2 of 4 in “git merge successfully however this is still issue from logical perspective”
  1. Lynn LinOct 26, 2011
  2. Thomas RastOct 26, 2011
  3. Lynn LinOct 26, 2011
  4. Thomas RastOct 26, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.