Before merging your pull requests, other changes may get merged into the base branch causing your pull request's head branch to be out of sync. Updating your pull request with the latest changes from the base branch can help catch problems prior to merging.
You can update a pull request's head branch from the command line or the pull request page. The Update branch button is displayed when all of these are true:
- There are no merge conflicts between the pull request branch and the base branch.
- The pull request branch is not up to date with the base branch.
- The base branch requires branches to be up to date before merging or the setting to always suggest updating branches is enabled.
For more information, see "Require status checks before merging" and "Managing suggestions to update pull request branches."
If there are changes to the base branch that cause merge conflicts in your pull request branch, you will not be able to update the branch until all conflicts are resolved. For more information, see "About merge conflicts."
From the pull request page you can update your pull request's branch using a traditional merge or by rebasing. A traditional merge results in a merge commit that merges the base branch into the head branch of the pull request. Rebasing applies the changes from your branch onto the latest version of the base branch. The result is a branch with a linear history, since no merge commit is created.
リポジトリ名の下にある [pull request] をクリックします。
In the "Pull requests" list, click the pull request you'd like to update.
In the merge section near the bottom of the page, you can:
- Click Update branch to perform a traditional merge.
- Click the update branch drop down menu, click Update with rebase, and then click Rebase branch to update by rebasing on the base branch.