3.5 Years, 500k Lines of Go

Re:3.5 Years, 500k Lines of Go by rogpeppe1 on Friday March 24, 2017 @01:53PM (#13950809)

I tend to check out one branch, run godeps -u, then check out the other one and run godeps -N -u. Then you've got the newest deps from both branches. I still wouldn't resolve the conflict manually.

[ Parent | on HN ]

Re:3.5 Years, 500k Lines of Go by NateDad on Friday March 24, 2017 @02:16PM (#13950978)

TIL I learned about godeps -N.... a month too late :) Cool, though, that definitely would help with that problem.

[ Parent | on HN ]