...
[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
[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
[10:47:16 CST(-0600)] <drewwills> i thought you'd have to name a branch for that
[10:47:24 CST(-0600)] <EricDalquist> well if you are on rel-4-0-patches it would have setup remote-tracking for that branch
[10:47:41 CST(-0600)] <EricDalquist> git knows that the local rel-4-0-patches branch is based on origin/rel-4-0-patches
[10:47:48 CST(-0600)] <EricDalquist> and tries to save you work by doing the fetch and merge
[10:47:55 CST(-0600)] <EricDalquist> I'll go review that workflow doc
[10:48:08 CST(-0600)] <EricDalquist> make sure it is up to date
[10:48:22 CST(-0600)] <drewwills> ok... i thought "git pull origin" would update all the origin/xxx branches
[10:48:39 CST(-0600)] <EricDalquist> git fetch origin does that
[10:48:58 CST(-0600)] <drewwills> hmmm... ok
[10:49:28 CST(-0600)] <EricDalquist> do a "git help pull"
[10:49:38 CST(-0600)] <EricDalquist> the doc has a good explanation of what it does
[13:54:32 CST(-0600)] <dd> hello