merge a git branch into master

git 開分支很快,透過 git branch 就可以了,切換 local 和 server 上的  branch 是使用 git checkout, 有分支總有一天會需要匯回master, 合併的指令如下:


git checkout master
git pull origin master
git merge test
git push origin master

If I have a local branch from a remote one, I don’t feel comfortable with merging other branches than this one with the remote. Also I would not push my changes, until I’m happy with what I want to push and also I wouldn’t push things at all, that are only for me and my local repository. In your description it seems, that test is only for you? So no reason to publish it.

git always tries to respect yours and others changes, and so will --rebase. I don’t think I can explain it appropriately, so have a look at the Git book – Rebasing or git-ready: Intro into rebasingfor a little description. It’s a quite cool feature

 

 

相關文章:

Git 分支 – 分支的新建與合併
https://git-scm.com/book/zh-tw/v1/Git-%E5%88%86%E6%94%AF-%E5%88%86%E6%94%AF%E7%9A%84%E6%96%B0%E5%BB%BA%E8%88%87%E5%90%88%E4%BD%B5

解決合併的衝突
https://backlogtool.com/git-tutorial/tw/stepup/stepup2_7.html

How do I update a GitHub forked repository? 同步分出來的分支
http://max-everyday.com/2017/01/how-do-i-update-a-github-forked-repository/

Facebook網友回應

您可能也會感興趣的文章...

VideoProc 3.5 限時免費授權

電腦相關應用

VideoProc是一個很好用的影片的轉檔/剪接/加浮水印程式。大部份的情況下,使用cyberlink 的威力 […]

Read More

獅尾B2腿黑體:有墨暈效果的思源黑體免費商用

電腦相關應用

獅尾B2腿黑體基於思源黑體的轉角的三角形轉成半圓形改造,腿黑指沒被拔腳的黑體,彷彿墨暈或是稍微過曝的效果。支援 […]

Read More

花園肉丸:遊走於古典與可愛之間的字體免費商用

電腦相關應用

使用「獅尾肉丸」字體的轉換程式,套用到「花園明朝」字體後,效果滿好的,分享較圓的「花園明朝」字體給大家使用。 […]

Read More

發佈留言

發佈留言必須填寫的電子郵件地址不會公開。 必填欄位標示為 *