git - 弧形土地失败 : no commits on <feature-branch> which are not already present on target

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 中没有看到我的功能分支。为什么不呢？

我可以把那个分支 pull 回来:

$ 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 时，它无法执行“着陆”您的更改的主要功能。