Re: fake merges

[Stefano Lattarini]

At Sunday 08 August 2010, Ralf Wildenhues wrote:
> > Pardon my ignorance, but what do you mean by "a fake merge"?
> 
> When you merge a branch A into B, then it can happen that git sees
> no conflicts, but in reality things break anyway.  This can easily
> happen when, say, A renames a variable, B adds new code using the
> old variable. Then you need to fix up the code after the merge. 
> You can 'git commit --amend' the fixup to the merge.  I think this
> is what is called a fake merge.
> 
> In the case of regenerating with newer Autoconf, I just ran
> bootstrap on maint with 2.67, merged that into branch-1.11.  That
> caused a conflict, but even if it hadn't, I would've rerun
> bootstrap and commit --amend'ed so that files are correct for the
> branch.  Same for master.
>
Ha! It's clear now.

Thanks,
  Stefano