5 ms·
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 wo
by rogpeppe1 9y ago
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.
- NateDad 9y agoTIL I learned about godeps -N.... a month too late :) Cool, though, that definitely would help with that problem.