...
[10:45:40 CST(-0600)] <EricDalquist> but post cherry-pick your local rel-4-0 branch had diverged
[10:46:14 CST(-0600)] <drewwills> it's confusing... does git pull origin do anything to the locally checked-out branch? i thought it didn't... that it only updated origin/xx branches
[10:46:19 CST(-0600)] <EricDalquist> yes
[10:46:22 CST(-0600)] <EricDalquist> it does
[10:46:27 CST(-0600)] <EricDalquist> it does a fetch
[10:46:29 CST(-0600)] <EricDalquist> and then a merge
[10:47:04 CST(-0600)] <drewwills> ok... i wasn't sure how it would know which branch to merge