-
Notifications
You must be signed in to change notification settings - Fork 18k
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
cmd/go: make update work consistently for git #2109
Labels
Milestone
Comments
Tarmigan writes: > This doesn't solve the merging issue though, because if you have uncommitted changes in your working tree, they could be lost in checking out the detached HEAD, so git may complain and refuse the checkout. That's what I want it to do. If the local changes are compatible, the operation succeeds, and the file remains changed. If they are not compatible, I get this message: $ git checkout origin/release error: Your local changes to the following files would be overwritten by checkout: skygen/skygen.go Please, commit your changes or stash them before you can switch branches. That's exactly what I want to see, since I changed a file locally that was also changed in the repo. The merge would fail too. I'd be more concerned about furtive merges that do *not* fail. |
Owner changed to builder@golang.org. |
This issue was closed by revision 0f10566. Status changed to Fixed. |
This issue was closed.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
The text was updated successfully, but these errors were encountered: