...
[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