如何在 GitHub 上使用 master 更新分支

Question

I have a Sprint branch that was created prior to new updates on Master. Since then, the changes were pushed to the master branch, now I have to update the Sprint branch. I am trying to sync my Sprint branch with a master.

Is there a way to do it through github.com page, otherwise I am using PhpStorm VCS.

Answer 1

It's simple and can be done by two command lines.

git checkout sprint
git merge origin/master

This will merge the remote master branch to the local sprint branch. So your local sprint branch is up to date like master branch. If you need to do this on Github.com, then create a PR(Pull Request) and then select two branches(base:sprint and compare:master) and then merge it.

Answer 2

Try merging master branch(with latest changes) to your sprint branch. This will get your master commits (absent from sprint branch) to your sprint branch. Then merge your sprint branch(having commits absent from master) to master branch.

Through Github Web page

1. Raise a pull request from master to sprint branch.
2. Merge the pull request using github's UI.
3. Raise a pull request from sprint branch to master.
4. Merge the pull request.

Through Command Line

git checkout master
git pull origin master
git checkout sprint
git merge master
git checkout master
git merge sprint
git push origin sprint

Answer 3

It's worth noting, although not directly requested by you, that Github Desktop has hugely simplified this functionality. With "Current Repository" set to your repo and "Current Branch" set to your Sprint branch, simply chose from the menus:

Branch->Update from Master ( Ctrl + Shift + U on Windows/Linux or ⌘ + Shift + U on Mac OSX)

Once that's complete, you'll get a "Push Origin" button to push the changes to Sprint. ( Ctrl + Shift + P or ⌘ + Shift + P on Mac OSX)

In short:

Ctrl + Shift + U

Ctrl + Shift + P