git-octopus icon indicating copy to clipboard operation
git-octopus copied to clipboard
verified publisher icon lesfurets

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

Open dubreuia opened this issue 9 years ago • 2 comments

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.

dubreuia avatar Oct 13 '16 08:10 dubreuia

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

apflieger avatar Oct 13 '16 21:10 apflieger

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

dubreuia avatar Oct 14 '16 16:10 dubreuia