We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
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
I am pretty sure I did not touch my master. Is it a legit issue and if so what could be the fix for it.
Yes
git co -f master git pull
git co -f master
git pull
It should have pulled recent changes from upstream.
merge conflict :(
The text was updated successfully, but these errors were encountered:
found the culprit #28915
Sorry, something went wrong.
No branches or pull requests
I am pretty sure I did not touch my master. Is it a legit issue and if so what could be the fix for it.
Does this issue reproduce with the latest release?
Yes
What did you do?
git co -f master
git pull
What did you expect to see?
It should have pulled recent changes from upstream.
What did you see instead?
merge conflict :(
The text was updated successfully, but these errors were encountered: