at some point i got so frustrated i just fucking cherry picked

and then went through merge conflict hell with EVERY COMMIT before realizing i had cherry-picked BACKWARDS

i had to DO IT ALL AGAIN

@aescling oh you probably need to use rebase --onto trunk commit-you-rebased-from-last-time

@aescling rebase starts from the last common commit which will be basically the fork point in our case

rebase --onto b a only rebases the changes since a onto the branch b

@aescling this is something i recently had to research because at work we have this same problem

@Lady i’ll have to make sure to try that out sometime