git rebase onto remote updates

后端 未结 4 2568
慢半拍i
慢半拍i 2020-12-23 18:39

I work with a small team that uses git for source code management. Recently, we have been doing topic branches to keep track of features then merging them into master local

4条回答
  •  青春惊慌失措
    2020-12-23 19:00

    You can also just rebase against the up-to-date master

    git checkout topic_1
    git rebase refs/remotes/origin/master
    

    Which obviates the need for the pull (at least until the EOL of your feature branch). Our process uses GitHub pull requests so I never need to do that locally.

提交回复
热议问题