Closed shimwell closed 3 years ago
@Shimwell Just as a note, in case it helps.
You can use git rebase -i --autosquash upstream/master
when squashing changes. The -i
means interactive, and lets you squash commits in the branch. The --autosquash
means it will automatically sort and squash commits created with the --fixup
option. I am assuming you have a Git remote named upstream
pointing to this repo (as opposed to your origin
fork).
Once the rebase/squash is done, you can simply push -f
your changes. The pull request will automatically be updated.
I would recommend against this practice if the pull request is long, since it may make reviews a little bit harder. But if it is a short one (few changes), or if you are just squashing the already-reviewed changes before merging... I think it's great. :blush:
Thanks for the auto squash tip, I had not seen that trick.
This is a cleaner rewrite of PR #22
The aim is to add pytest CI using Github actions
I've still not got git squash to work so here is a cleaner single commit PR