How do I backport a commit in git?

前端 未结 5 1999
说谎
说谎 2020-12-08 03:54

So, I have a maintenance branch and a master branch in my project. If I make a commit in the maintenance branch and want to merge it forward to the master branch, that\'s ea

5条回答
  •  生来不讨喜
    2020-12-08 04:39

    Yes, it is considered cherry-picking and no, generally it should not introduce problems. If commit doesn't apply cleanly when backporting you may face exactly same conflict when cherry-picking it back.

提交回复
热议问题