【转】怎么将master合并到branch

yujietian

摘要: 一般是把branch合并到master,那反过来呢。。。

来自SO顶得最多的答案：http://stackoverflow.com/questio ... evelopment-branches

This workflow works best for me:

git checkout -b develop

...make some changes...

...notice master has been updated...

...commit changes to develop...

git checkout mastergit pull

...bring those changes back into develop...

git checkout developgit rebase master

...make some more changes...

...commit them to develop...

...merge them into master...

git checkout mastergit pullgit merge develop

转自：https://my.oschina.net/uniquejava/blog/502357?p=1