Closed FordFriedel closed 6 months ago
Also if you can remind me how to rebase and squash I manage to struggle with that
LGTM
Also if you can remind me how to rebase and squash I manage to struggle with that
Two possibilities:
A) From you branch do a rebase via git rebase -i origin/develop
and change pick
to s
for every commit except the first. s
squashes the commit together with the pick
ed commit before.
B) Undo all commits since origin/develop but keeping your local files with git reset --soft origin/develop
, then do one commit as per usual
I can also just press squash here if you like to. :)
Integrated via #242
As requested in #227
This PR has NOT been tested, I will do so tonight