bookmark : phabricator: arc land on branch

from : how to merge commit using arc land on branch

---

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