Dilip M <dilipm79@xxxxxxxxx> 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/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html