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

git merge 的疑问

  •  
  •   datadump ·
    PRO
    · Nov 9, 2023 · 2033 views
    This topic created in 1104 days ago, the information mentioned may be changed or developed.


    git checkout main
    git merge hotfix1

    是不是合并 c3,c5,c6 到 c4 上?(先找到共同祖先 c2 ,然后再合并?)
    有木有办法只合并 c5,c6 呢(不要 c3 )?
    NessajCN
    NessajCN
    Nov 9, 2023
    1
    git rebase --onto main branchtest hotfix1
    datadump
    datadump
    OP
    PRO
    Nov 10, 2023
    2
    @NessajCN 谢谢
    itskingname
    itskingname
    Nov 10, 2023
    3
    如果只需要 c5, c6,我平时是用 cherry-pick 实现的。

    git checkout main
    git cherry-pick c5 然后解冲突(如果有)
    git cherry-pick c6 然后解冲突(如果有)
    git cherry-pick hotfix
    git commit
    git push
    datadump
    datadump
    OP
    PRO
    Nov 10, 2023
    4
    @itskingname 谢谢

    cherrypick 好像只能 pick 单个 commit 。一楼的比较方便
    About   ·   Help   ·   Advertise   ·   Blog   ·   API   ·   FAQ   ·   Privacy   ·   Solana   ·   4317 Online   Highest 6679   ·     Select Language
    创意工作者们的社区
    World is powered by solitude
    VERSION: 3.9.8.5 · 52ms · UTC 09:09 · PVG 17:09 · LAX 01:09 · JFK 04:09
    ♥ Do have faith in what you're doing.