ブランチの同期

About branch synchronization

You can sync your local branch with the remote repository by pulling any commits that have been added to the branch on GitHub since the last time you synced. If you make commits from another device or if multiple people contribute to a project, you will need to sync your local branch to keep the branch updated.

When you pull to your local branch, you only update your local copy of the repository. To update your branch on GitHub, you must push your changes. For more information, see "Pushing changes to GitHub."

To add changes from one branch to another branch, you can merge the branches. To apply changes to your branch from another branch in the same repository, you can merge the other branch into your branch on GitHub Desktop. To request that changes from your branch are merged into another branch, in the same repository or in another repository in the network, you can create a pull request on GitHub Desktop. For more information, see "Merging another branch into your project branch" and "About pull requests."

Some workflows require or benefit from rebasing instead of merging. リベースすることで、コミットの順序を変更したり、編集したり、まとめて squash したりできます。 For more information, see "About Git rebase" and "Rebasing your project branch onto another branch."

Pulling to your local branch from the remote

1. In GitHub Desktop, use the Current Branch drop-down, and select the local branch you want to update.
2. To check for commits on the remote branch, click Fetch origin
   
3. To pull any commits from the remote branch, click Pull origin or Pull origin with rebase.
   
4. テキストエディタ、コマンドライン、または他のツールなどの好みの方法で、マージコンフリクトがあれば解決してください。 For more information, see "Addressing merge conflicts."

Merging another branch into your project branch

1. In GitHub Desktop, click Current Branch.

   

2. Choose a branch to merge into BRANCH（BRANCHにマージするブランチの選択）をクリックしてください。

   

3. 現在のブランチのマージしたいブランチをクリックし、Merge BRANCH into BRANCH（ブランチにブランチをマージ）をクリックしてください。

   注釈：マージコンフリクトがある場合、GitHub DesktopはMerge BRANCH into BRANCHボタンの上に警告を表示します。 全てのコンフリクトを解決するまではブランチをマージすることはできません。

   

4. Click Push origin to push your local changes to the remote repository.

   

Rebasing your project branch onto another branch

参考リンク

• "Pull" in the GitHub glossary
• "Merge" in the GitHub glossary
• "Rebase" in the GitHub glossary