Chris,
When updating Go source to go1.8.3, I encountered this error:
~ $ cd go/src
~/go/src $ git pull
remote: Counting objects: 11146, done
remote: Finding sources: 100% (528/528)
remote: Total 528 (delta 232), reused 503 (delta 232)
Receiving objects: 100% (528/528), 682.08 KiB | 505.00 KiB/s, done.
Resolving deltas: 100% (232/232), completed with 101 local objects.
From
https://go.googlesource.com/go 8babce2..352996a release-branch.go1.8 -> origin/release-branch.go1.8
366bb67..a9d8d4d master -> origin/master
753452f..2b7a7b7 release-branch.go1.7 -> origin/release-branch.go1.7
* [new tag] go1.7.6 -> go1.7.6
* [new tag] go1.8.3 -> go1.8.3
* [new tag] go1.8.2 -> go1.8.2
Auto-merging VERSION
CONFLICT (content): Merge conflict in VERSION
Automatic merge failed; fix conflicts and then commit the result.
~/go/src $ git branch
* release-branch.go1.8
$ date
Thu May 25 09:15:18 EDT 2017
~/go/src $
Peter