弧地失敗：沒有提交關於<功能分支>這是不是已經存在於目標

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. 

/咆哮。我沒有看到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插件可以「着陸」你的變化。 git flow feature finish <feature>已經「降落」了您的更改，因此當您運行arc land時，它無法執行其「着陸」更改的主要功能。