弧域失败:不提交未在目标上出现的<特征分支>

Question

或多或少，我是故意创建这个场景的：

# We use git-flow.
$ git flow feature start <feature>

# update a file
$ git commit <file> -m '<message>'
$ git rebase -i develop
$ git push -u origin <feature-branch>

# Try arcanist now
$ arc diff

# diff was accepted
$ git flow feature finish <feature>

# feature branch removed, now in develop, let's push
$ git push

因此，现在我处于一个分支已经消失的状态，由于本地分支不可用，所以我无法实现土地的弧形。注意: git (和珍珠岩)工作非常好，

$ arc land

Exception
Branch "<feature-branch>" does not exist in the local working copy.

/rant..我在Phabricator's Maniphest没有看到我的特征分支。为什么不行？

我可以把树枝拉回来：

$ git fetch -a
$ git checkout <feature-branch>

但我仍然无法着陆：

$ arc land
Landing current branch '<feature-branch>'.
TARGET  Landing onto "<feature-branch>", selected by following tracking branches upstream to the closest remote.
REMOTE  Using remote "origin", selected by following tracking branches upstream to the closest remote.
FETCH  Fetching origin/<feature-branch>...

Usage Exception: There are no commits on "<feature-branch>" which are not already present on the target.

据我所知，我没有办法解决这个问题。我怎么恢复？

Answer 1

arc close-revision <Diff-ID>应该关闭它。基本上，您有两个竞争的Git附加组件，是“登陆”您的变化。git flow feature finish <feature>已经“登陆”了您的更改，所以当您运行arc land时，它无法执行其“登陆”更改的主要功能。