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.

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

merge conflict on pulling golang/go #28922

Closed
mfrw opened this issue Nov 22, 2018 · 1 comment
Closed

merge conflict on pulling golang/go #28922

mfrw opened this issue Nov 22, 2018 · 1 comment

Comments

@mfrw
Copy link
Contributor

mfrw commented Nov 22, 2018

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 :(

@mfrw
Copy link
Contributor Author

mfrw commented Nov 22, 2018

found the culprit #28915

@mfrw mfrw closed this as completed Nov 22, 2018
@golang golang locked and limited conversation to collaborators Nov 22, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

No branches or pull requests

2 participants