Question

我正在使用phabricator，最近遇到了arc land的问题：

我创建了一个测试存储库，做了一个提交，并使用arc diff将其放入phabricator中。按预期工作。提交位于名为“new_feature”的分支下。

在phabricator中，diff被拒绝用于测试目的。拒绝后，我尝试了arc land：

$ ~/git/test> git branch
   master
   * new_feature

$ ~/git/test> arc land
Landing current branch 'new_feature'.
Switched to branch master. Updating branch...
Exception
Command 'git pull --ff-only' failed with error #1:
stdout:

stderr:
You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.

If you often merge with the same branch, you may want to
use something like the following in your configuration file:

    [branch "master"]
    remote = <nickname>
    merge = <remote-ref>

    [remote "<nickname>"]
    url = <url>
    fetch = <refspec>

See git-config(1) for details.

下一步，审阅者接受了补丁，但arc land抛出了同样的异常。想法？

Phabricator - arc land因错误的git调用而抛出异常

0 个答案: