...
[13:15:21 CDT(-0500)] <EricDalquist> the little i in a circle to the left of the merge button
[13:15:32 CDT(-0500)] <EricDalquist> you'll want to do steps 1 & 2
[13:15:45 CDT(-0500)] <EricDalquist> then do "git rebase master"
[13:15:49 CDT(-0500)] <EricDalquist> that should fix all the merge commits
[13:15:56 CDT(-0500)] <EricDalquist> then do step 3
[13:16:02 CDT(-0500)] <athena> ok, terrific
[13:16:07 CDT(-0500)] <athena> that makes sense
[13:16:11 CDT(-0500)] <EricDalquist> yeah, its pretty straight forward
[13:16:14 CDT(-0500)] <athena> yeah
[13:16:20 CDT(-0500)] <athena> wanted to make sure i was rebasing at the right spot
[13:16:24 CDT(-0500)] <athena> but that totally makes sense