My current work-around is to only do git merges with version older than 1.7.8. http://code.google.com/p/git-core/downloads/detail?name=git-1.7.6.5.tar.gz for example worked fine for me. Of course that's not sustainable and only works in situations where upstream is aware of this issue.
My current work-around is to only do git merges with version older than 1.7.8. http:// code.google. com/p/git- core/downloads/ detail? name=git- 1.7.6.5. tar.gz for example worked fine for me. Of course that's not sustainable and only works in situations where upstream is aware of this issue.