...
Although there are often multiple paths to achieve an outcome in git and GitHub, there is value in defining a suggested path, both for the benefit of new GitHub users, and for the sake of project consistency.
- Rebase merging is preferred over Merge commits and Squash merging to keep commit history and PR description clean (assuming contributors squash/amend their own pull requests)
- amend commits instead of squashing commits - "git commit --amend"
- Mergifyio Mergify to simplify cherry picks and backports - "@Mergifyio backport <branch>"
- Example Fabric guidance doc for forking, branching, remotes, creating pull requests, updating pull requests, cherry picking