git
› Pro Git
› Atlassian Git Tutorial
› Pro Git 简体中文翻译
› GitX
georgetso
V2EX  ›  git

多人协同开发的 merge 到底哪边 merge 到哪边?

  •  
  •   georgetso · Aug 27, 2014 · 4572 views
    This topic created in 4467 days ago, the information mentioned may be changed or developed.
    首先 origin/master 不做开发
    jack 开发网络模块 origin/networking
    rose 开发ui模块 origin/ui

    那么,jack的网络模块开发完成后,是到 master 去 merge networking
    git checkout master
    git merge networking

    还是相反
    git checkout networking
    git merge master
    11 replies  •  2014-09-04 09:29:52 +08:00
    pythoner
    pythoner
    Aug 27, 2014❤️1
    1
    请参考git-flow工作流: http://www.juvenxu.com/2010/11/28/a-successful-git-branching-model/

    用得安心,合并得放心,boss再也不用担心你的代码了
    wanquribao
    wanquribao
    Aug 27, 2014 via iPhone
    2
    前者。git merge network
    66450146
    66450146
    Aug 27, 2014
    3
    origin/master 不开发,配置自动部署
    origin/develop 不开发,配置自动部署到测试环境
    origin/networking ----> origin/develop 并测试
    origin/ui ----> origin/develop 并测试
    TangMonk
    TangMonk
    Aug 27, 2014
    4
    https://www.atlassian.com/git/workflows

    看下 bitbucket 的 git workflow tutorial, 我就是看了这个看懂的。
    run2
    run2
    Aug 27, 2014 via iPad
    5
    只要不出两个goto fail就可以了 😏 貌似Apple那个epic fail就是merge出来的
    kshift
    kshift
    Aug 27, 2014
    6
    rebase
    finian
    finian
    Aug 27, 2014
    7
    如果按 git-flow 来的话,3楼正解
    georgetso
    georgetso
    OP
    Aug 27, 2014
    8
    @66450146 这意思是不是说

    git checkout develop
    git merge networking

    ??
    66450146
    66450146
    Aug 27, 2014
    9
    @georgetso 这贴里面已经有两个 git-flow 的链接了,看了就懂
    georgetso
    georgetso
    OP
    Aug 28, 2014
    10
    我现在的做法是,
    本地创建 networking,编辑,commit
    git checkout master
    git pull origin master
    git merge networking
    git push origin master
    git checkout networking
    git merge master

    也就是说,networking 压根儿不丢到服务器上,全在本地开发
    经测试,jack和rose各自维护自己的branch,服务器只有一个master,完全没问题
    ryanking8215
    ryanking8215
    Sep 4, 2014
    11
    1楼博文:
    `可惜的是,我没能找到方法让–no-diff成为默认的git merge行为参数,但其实应该这么做。`

    shell搞个alias就行了呀
    About   ·   Help   ·   Advertise   ·   Blog   ·   API   ·   FAQ   ·   Privacy   ·   Solana   ·   3724 Online   Highest 6679   ·     Select Language
    创意工作者们的社区
    World is powered by solitude
    VERSION: 3.9.8.5 · 33ms · UTC 09:51 · PVG 17:51 · LAX 01:51 · JFK 04:51
    ♥ Do have faith in what you're doing.