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

On Wednesday, May 24, 2017 at 5:12:52 PM UTC-4, Chris Broadfoot wrote:
>
> Hi gophers,
>
> We have just released Go version 1.8.3, a minor point release.
>
> This release includes fixes to the compiler, runtime, documentation, and 
> the
> database/sql package.
>     https://golang.org/doc/devel/release.html#go1.8.minor
>
> It also includes the security fix to the crypto/elliptic package from Go 
> 1.8.2.
>
> You can download binary and source distributions from the Go web site:
>     https://golang.org/dl/
>
> To compile from source using a Git clone, update to the release with "git 
> checkout go1.8.3" and build as usual.
>
> Thanks to everyone who contributed to the release.
>
> Chris
>

-- 
You received this message because you are subscribed to the Google Groups 
"golang-nuts" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to golang-nuts+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to