VCS_INFO_get_data_git:238: no such file or directory: .git/MERGE_MSG

[dubreuia]

A warning message started appearing when using git conflict. It seems git thinks he is in a merge during the conflict resolution, so he's looking for a file git conflict didn't initialized. Doing touch .git/MERGE_MSG removes the warning.

[apflieger]

I don't see how it can happen, do you have an idea of how to reproduce it ?

[dubreuia]

I'll post steps to reproduce from a clean repo with octopus version when I get home.