...
[13:16:24 CDT(-0500)] <athena> but that totally makes sense
[13:16:42 CDT(-0500)] <athena> suspecting we want to make rebasing part of the normal pull request flow at this point
[13:16:54 CDT(-0500)] <athena> since otherwise i think it's more awkward to pull changes back into the maintenance branch?
[13:17:06 CDT(-0500)] <EricDalquist> well it depends on the pull
[13:17:19 CDT(-0500)] <EricDalquist> if it was "branch, commit(s), pull" then it isn't a big deal
[13:17:23 CDT(-0500)] <athena> yeah
[13:17:26 CDT(-0500)] <athena> but for something like this
[13:17:39 CDT(-0500)] <EricDalquist> the problem comes if they ever merge from master back into the branch