Merge a pull request into the upstream branch when work is completed. Anyone with push access to the repository can complete the merge.| GitHub Docs
You can resolve merge conflicts using the command line and a text editor.| GitHub Docs
If your changes have merge conflicts with the base branch, you must address the merge conflicts before you can merge your pull request's changes.| GitHub Docs
This glossary introduces common Git and GitHub terminology.| GitHub Docs
The Basic Rebase| git-scm.com
Learn about pull requests and draft pull requests on GitHub. Pull requests communicate changes to a branch in a repository. Once a pull request is opened, you can review changes with collaborators and add follow-up commits.| GitHub Docs
You can protect important branches by setting branch protection rules, which define whether collaborators can delete or force push to the branch and set requirements for any pushes to the branch, such as passing status checks or a linear commit history.| GitHub Docs
--commit --no-commit | git-scm.com
If <branch> is specified, git rebase will perform an automatic| git-scm.com