git pull request with
I'm trying to follow this model: http://nvie.com/posts/a-successful-git-branching-model/
And trying to understand how a merge like this would work from a pull request on Github... specifically the "--no-ff" flag:
git merge --no-ff hotfix-1.2.1
Additionally, after the PR request has been merged on Github, what is the best way to bring those updates into my local master branch? Would it just be:
git pull github-remote-branch
Pull request merges on GitHub always create a new commit, so they already act like git merge --no-ff ... .
[A]fter the PR request has been merged on Github, what is the best way to bring those updates into my local master branch?
If your local master branch is set up to track the remote master branch, just do
git checkout master
git pull --ff-only
This will abort with an error if you have commits on local master branch that aren't on the remote master branch. (The default without --ff-only would have been to merge.)
上一篇: 创建功能分支有什么好处？
下一篇: git拉请求