How to merge a commit using arc land on release branch, other than master branch?

作者: shaneZhang 分类: 互联网技术 发布时间: 2015-07-02 16:20

I have a commit to fix a bug which is to merge on the current release branch.
Track a branch from remote naming release in local.

$ git branch -a 
$ git branch --track release remotes/origin/release

Make another branch from release for issue fixing, e.g fix-issue

$ git branch fix-issue release 
$ git checkout fix-issue 

Make a change to fix a bug and commit those changes.
Upload changes to differential for reviewer

$ arc diff [It will create a revision number like 'DX', X is a number]. 

If reviewer accept the revision then merge the revision

$ arc land --onto release  

Note: If you skip step 2, and commit change on tracked branch release, then arc land or arc land –onto release will show following error.
Work around is simple. Make a patch for that revision which will create a branch containing those changes.

$ arc patch D123

Merge the revision to the release branch

$ arc land arcD123 --onto release

本页面支持AMP友好显示:How to merge a commit using arc land on release branch, other than master branch?

如果觉得我的文章对您有用,请随意打赏。如果有其他问题请联系博主QQ(909491009)或者下方留言!

发表评论

电子邮件地址不会被公开。 必填项已用*标注