Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Open
dubreuia opened this issue Oct 13, 2016 · 2 comments
Open

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

dubreuia opened this issue Oct 13, 2016 · 2 comments

Comments

@dubreuia
Copy link
Contributor

dubreuia commented Oct 13, 2016 •
edited
Loading

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
Copy link
Contributor

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

@dubreuia
Copy link
Contributor Author

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@dubreuia @apflieger