[Insight-developers] vxl update

[Brad King]

On 12/02/2010 09:30 AM, Bradley Lowekamp wrote:
> Is there any way to view how the conflicts were resolved?

Good question.  The commit of interest is 0802481.  That is where the
bulk of the work was done.  Normally a command like

 $ git show 0802481 -M

would show exactly what you want to see.  However, since this was a
subtree merge Git thinks the tree in 0802481^2 was massively renamed
to be under Utilities/vxl in 0802481 and shows every file in the
output of the command.

In order to see a clean view of the merge result as if the content
below Utilities/vxl were the top of the tree on both sides, you can
create your own merge commit with the trees involved locally.  Paste
these commands into bash:

  itk=$(echo itk | git commit-tree 0802481^1:Utilities/vxl)
  merged=$(echo merged | git commit-tree 0802481:Utilities/vxl -p $itk -p 0802481^2)
  git show $merged

You can also do

  gitk $merged

or

  git show -w $merged

-Brad K