gh pr checkout 236 (this is the github cli. can be installed from homebrew)
git fetch --all
git rebase -i upstream/main
.. edit commit list to remove all already in main that don't form part of this work - in this case those authored my myself or ljupcho. Generally it would be everyone except for you, the author
Save the file. Git will reapply the commits on top of main
git push origin atruvia/main:taylaychart (sorry, I made a typo!)
Open up new PR for review
Note that whoever rebases will also end up doing a signoff on each commit.
I will leave this open, but it may make sense you check the approach works for you and update the original. If you have any problems we can use this one instead
Example of cleaning up commit history for #236
gh pr checkout 236(this is the github cli. can be installed from homebrew)git fetch --allgit rebase -i upstream/maingit push origin atruvia/main:taylaychart(sorry, I made a typo!)Note that whoever rebases will also end up doing a signoff on each commit.
I will leave this open, but it may make sense you check the approach works for you and update the original. If you have any problems we can use this one instead
@juergenhemelt @T4ylan