Git: branching, merge vs rebase, conflicts, reflog and the pull request flow
Branches and fast-forwards, resolving merge conflicts, merge or rebase, interactive rebase, cherry-pick, revert, reset, Git Flow vs trunk-based, reflog, bisect and code review through pull requests.