Arc land失败：<feature-branch>上没有提交目标上尚未提交的内容

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（和gitolite）工作得很好

$ arc land

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

/ rant ..我没有在Phabricator的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附加组件，即＃34;登陆＆＃34;你的改变。 git flow feature finish <feature>已经＆＃34;登陆＆＃34;您的更改，因此当您运行arc land时，它无法执行其主要功能＃34;登陆＆＃34;你的改变。