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

which files will have conflicts between two branches?

From
JJ.V. <jvsrvcs@gmail.com>
Date
Mar 27, 2013, 21:48 UTC
Message-ID
<5153694B.2010405@gmail.com>

I have two local branches (tracked to remote) that are in sync (did a git pull on both branches from their corresponding remote).

Is this the best way to merge?

I would be merging local/branch1 => local/branch2 (test this branch) and then push local/branch2 => origin/branch1 (and would expect no merge conflicts if anyone has not checked in anything.

--- Also with two local branches, Is there a way to get a list of files (one line per file) of files that would have merge conflicts that would need to be resolved?

thanks
J.V.
Next: Magnus Bäck
Message 1 of 2 in “which files will have conflicts between two branches?”
  1. J.V.Mar 27, 2013
  2. Magnus BäckMar 28, 2013

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.