...
[10:44:44 CST(-0600)] <drewwills> yeah
[10:44:57 CST(-0600)] <drewwills> not in origin/rel-4-0-patches?
[10:44:59 CST(-0600)] <EricDalquist> pull is good if your local branch is clean
[10:45:18 CST(-0600)] <EricDalquist> so pull would have been fine pre cherry-pick
[10:45:24 CST(-0600)] <drewwills> bleh
[10:45:40 CST(-0600)] <EricDalquist> but post cherry-pick your local rel-4-0 branch had diverged