* David Terei:
> Sorry for any conflicts this caused to your work, I think git
> handles this pretty well normally. If I did a rm + add instead of a
> rename this may have caused issue though.
Git doesn't record renames in the history, so there is no difference.
_
* Vivian McPhail:
> I successfully downloaded and installed, using git, the GHC HEAD. The build
> was successful. However, I just tried to `./sync-all pull` but there were
> conflicts and the action was not successful. Now I get:
> Pull is not possible because you have unmerged files.
Thi
* Simon Marlow:
> Thanks for this. I distilled your example into a shell script that
> uses git, and demonstrates that git gets the merge wrong:
>
> http://hpaste.org/42953/git_mismerge
>
> Still, git could get this merge right, it just doesn't (I know there
> are more complex cases that would
