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

Re: git log --graph

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Oct 12, 2009, 06:54 UTC
Message-ID
<vpqtyy5rtjn.fsf@bauges.imag.fr>
In-Reply-To
<c94f8e120910112001l50f9332fs43d0762bbd9207a3@mail.gmail.com>
Dilip M <dilipm79@gmail.com> writes:
> Understood. it shows only when I have merged conflicts!
>
> In case, it is a fast forward merge. It doesn't show. Which is good :)

Fast-forward and merge conflicts are two different things. Non-fast forward occurs when you merge two branches which are not a direct ancestor of each other, i.e. both have commits that the other do not have.

In case of non-fast forward, if you didn't touch the same file in both branches, the merge is still trivial and conflict-free. If you touched the same files, then Git has to apply in-file merge strategy, but that doesn't mean you'll get conflicts either. Conflicts will occur when you touched the same part of the same file.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Dilip MNext: B Smith-Mannschott
Message 6 of 7 in “git log --graph”
  1. Dilip MOct 11, 2009
  2. Sverre RabbelierOct 11, 2009
  3. Matthieu MoyOct 11, 2009
  4. Jakub NarebskiOct 11, 2009
  5. Dilip MOct 12, 2009
  6. Matthieu MoyOct 12, 2009
  7. B Smith-MannschottOct 12, 2009

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.