[10:11:42 CST(-0600)] <EricDalquist> morning drewwills
[10:11:55 CST(-0600)] <EricDalquist> I'll take a look at the rel-4-0 tree in just a minute
[10:35:32 CST(-0600)] <drewwills> morning – thanks
[10:35:37 CST(-0600)] <EricDalquist> so
[10:35:41 CST(-0600)] <EricDalquist> it isn't terrible
[10:35:45 CST(-0600)] <EricDalquist> only about 8 dupelicate commits
[10:35:52 CST(-0600)] <EricDalquist> not worth doing a force push to cleanup
[10:35:59 CST(-0600)] <EricDalquist> since that would break anyone that has pulled since your push
[10:36:00 CST(-0600)] <drewwills> that's what I imagined
[10:36:11 CST(-0600)] <EricDalquist> does gitk work on windows?
[10:36:23 CST(-0600)] <drewwills> yep
[10:37:01 CST(-0600)] <EricDalquist> that is what I usually have open when I'm doing merges
[10:37:07 CST(-0600)] <EricDalquist> just do an F5 in it after the merge
[10:37:13 CST(-0600)] <EricDalquist> and you get a nice picture of the history
[10:38:06 CST(-0600)] <drewwills> roger
[10:38:27 CST(-0600)] <drewwills> i did the work in master, then a $git cherry-pick in rel-4-0-patches
[10:38:58 CST(-0600)] <EricDalquist> what did you cherry-pick?
[10:39:16 CST(-0600)] <drewwills> i had done a $git pull origin master in master before starting, but forgot to pull within rel-4-0-patches before i cherry-picked
[10:39:22 CST(-0600)] <EricDalquist> oh ... I bet your rel-4-0-patches wasn't up to date
[10:39:24 CST(-0600)] <EricDalquist> yeah
[10:39:32 CST(-0600)] <drewwills> this: https://github.com/Jasig/uPortal/commit/0f08405beaa86b337f10fa602b3ec7d5a9485a6e
[10:39:40 CST(-0600)] <drewwills> yeah but that's not all
[10:39:44 CST(-0600)] <EricDalquist> did it give you a merge error when you tried to push?
[10:39:57 CST(-0600)] <drewwills> when i realized it, i did a git rebase rel-4-0-patches
[10:40:05 CST(-0600)] <drewwills> and looked at my llog
[10:40:09 CST(-0600)] <drewwills> and it looked right
[10:40:17 CST(-0600)] <drewwills> but then it refused to push
[10:40:46 CST(-0600)] <drewwills> so i did a git pull origin followed by git merge origin/rel-4-0-patches
[10:41:03 CST(-0600)] <EricDalquist> ah
[10:41:07 CST(-0600)] <drewwills> and then it would push... but it picked up some noise somewhere in there
[10:41:12 CST(-0600)] <EricDalquist> yeah]
[10:41:17 CST(-0600)] <EricDalquist> it was the merge that did it
[10:41:24 CST(-0600)] <EricDalquist> you should have done another rebase after the pull
[10:41:50 CST(-0600)] <EricDalquist> so when you did the first rebase you said "rebase this code on top of my local rel-4-0-patches branch pointer"
[10:42:06 CST(-0600)] <drewwills> i guess so, and that's the only conclusion I could drap at the time
[10:42:38 CST(-0600)] <drewwills> but i was surprised it wouldn't push when I manually revied the last 6-8 commits and confirmed they matched
[10:42:44 CST(-0600)] <EricDalquist> what you needed to do was a fetch "git fetch origin" that updates the remote branches to sync up with the origin remote
[10:43:15 CST(-0600)] <EricDalquist> then rebase your local branch on top of the remote branch by doing "git rebase origin/rel-4-0-patches"
[10:43:54 CST(-0600)] <EricDalquist> that says "replay the commits on my local branch on top of origin/rel-4-0-patches"
[10:44:14 CST(-0600)] <EricDalquist> and it would update the local rel-4-0-patches pointer to the end of that branch
[10:44:30 CST(-0600)] <drewwills> wouldn't "git pull orign" do everything "git fetch origin" would?
[10:44:39 CST(-0600)] <EricDalquist> pull does a fetch and a merge
[10:44:43 CST(-0600)] <EricDalquist> you don't want that merge to happen
[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