Git
Github FLow
A little easier version of Git Flow.
(https://guides.github.com/introduction/flow/)
Git FLow
A relative complex process to use git with multiple teams.
Update your development branch from another branch (main)
git pull --rebase origin main
Undo changes from from commit X and keep Theme
git reset --soft COMMIT-ID
https://git-scm.com/docs/git-reset#Documentation/git-reset.txt---soft
Undo last commit and keep changes
git reset --soft HEAD^1