Phabricator arc land won't work because that there are multiple revisions on feature branch

git phabricator
lpappone picture lpappone · Jun 19, 2015 · Viewed 18.8k times · Source

I have two branches, started at different points. They are mostly the same, except for a few extra commits on one of them. When I try to land that one, I get:

Usage Exception: There are multiple revisions on feature branch 'newbranch' which are not present on 'devel': -D newbranch1 -D othernew branch

Separate these revisions onto different branchs, or use --revision ' to use the commit message from and land them all.

I can't find any guidance as to how to separate the revisions onto different branches, or what that even means. Is there any way around this?

Answer

CEPA picture CEPA · Jun 19, 2015

I recommend to my developers that they need to use --revision to land the specific change.

Syntax: arc land --revision <diffID> --onto <branch>

For example: arc land --revision D123 --onto develop

Note: Only accepted revision can land.

Related questions

Can you arc diff against a particular git branch?

I'm pretty new to both Arcanist and git. I'd like to be able to create an arc diff (Phabricator Differential instance using Arcanist) against a git branch that I'm currently checked-out/working in (and I have one local un-pushed commit) …

Read More
Undo last diff in Phabricator

I have an open revision in Phabricator (with Git), and I submitted a diff to this revision, with the arc diff command. The problem is that this diff is bad, and so I would like to undo it and to …

Read More
Configure Git with SSH for Phabricator

I'm trying to configure SSH for Phabricator to get git running. I've followed this manual but when I call echo {} | ssh [email protected] conduit conduit.ping I always get an empty result or Permission denied (publickey,keyboard-interactive).. /etc/…

Read More