...
[12:12:44 CST(-0600)] <EricDalquist> you should only ever do a rebase if you haven't pushed the commits anywhere
[12:12:59 CST(-0600)] <EricDalquist> what that will do is essentially undo the commits and then replay them on the new HEAD
[12:13:06 CST(-0600)] <EricDalquist> to avoid the fork in the commit history
[12:13:33 CST(-0600)] <EricDalquist> try running gitk in your uPortal directory when on the master branch
[12:13:47 CST(-0600)] <EricDalquist> you should see a nice graph where the history diverges and merges