From kde-core-devel  Sun Aug 21 03:07:23 2011
From: Nicolas Alvarez <nicolas.alvarez () gmail ! com>
Date: Sun, 21 Aug 2011 03:07:23 +0000
To: kde-core-devel
Subject: Re: How to see the resolution of merge of KDE/4.7 into KF5
Message-Id: <j2pspd$6l0$1 () dough ! gmane ! org>
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=131389607713446

Stephen Kelly wrote:
> I couldn't make git show me the conflicts. I tried git show, which
> surprises me as it shows a 3 way diff of a single file which was
> apparently not in conflict (full output at
> http://steveire.com/mergecommit). I also tried several variations of git
> diff frameworks^...origin/KDE/4.7.
> 
> How can I see the conflicts resolved in a merge? Do I just see no conlicts
> because I chose the frameworks branch in every hunk (which actually I
> don't think I did)?

The 3-way diff doesn't show conflicted files. It shows files that, in the 
merge commit, aren't identical to the version in either merge parent, which 
means the file was modified in both branches being merged.

If you chose always the same branch (whether frameworks or 4.7) for all 
hunks within a file, that file is identical to the one in that branch, so it 
won't appear in 'git show'. On the other hand, if a file was changed in both 
branches but git could merge it automatically without a conflict, it *will* 
appear in 'git show'.

There is nothing in git that "remembers" whether you got a conflict or not 
(ie. whether git's merging algorithms failed to do the merge automatically 
and asked you to resolve it by hand).

-- 
Nicolas