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