Pushing to remote repository after merge “creates new remote heads” - is that bad?

后端 未结 2 453
长发绾君心
长发绾君心 2021-02-05 13:22
  1. I initialized a Mercurial project on Machine A, committed my changes and uploaded them to a remote

2条回答
  •  说谎
    说谎 (楼主)
    2021-02-05 13:30

    First: View your changes with hg log. The following didn't help in my case:

    • hg pull and hg merge (before you pull check against hg incoming)
    • or: hg pull --rebase

    But this helped.

    hg merge [revision]
    

    I found that I needed to explicitly merge some revisions which looked like heads.

提交回复
热议问题