Page MenuHomePhabricator

`arc land` continues when the merge fails
Closed, ResolvedPublic


An engineer reported this issue with arc land:
"arc just deleted my local branch after failing to land/merge it"


BUILDS PASSED Harbormaster builds for the active diff completed successfully.
 PUSHING Pushing changes to "origin/master".
To ssh://
 ! [rejected] 3f290cae1df8107b42ad38bb7cc656dca9e8edc6 -> master (fetch first)
error: failed to push some refs to 'ssh://'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Local "master" tracks target remote "origin/master", checking out and pulling changes.
Cleaning up branch "address_validation"...
(Use `git checkout -b address_validation d89181e7fc14553d02f3a191c97884ebdf17f90f` if you want it back.)
 DONE Landed changes.

Event Timeline

nickz assigned this task to epriestley.
nickz updated the task description. (Show Details)
nickz added a project: Arcanist.
nickz added a subscriber: nickz.
epriestley triaged this task as Normal priority.Nov 16 2015, 7:12 PM

What version of arc does the user have (per arc version)?

My expectation is that this was fixed by D14365 (rARCbaf5eb8a, Oct 28). See T3855#142308.

joshuaspence renamed this task from arc land continues when the merge fails to `arc land` continues when the merge fails.Nov 16 2015, 7:16 PM
joshuaspence updated the task description. (Show Details)
joshuaspence added a subscriber: joshuaspence.

His version:

arcanist cdda79e9a2b8d74430b0a9c5c3a8eab32887ab50 (13 Nov 2015)
libphutil cdda79e9a2b8d74430b0a9c5c3a8eab32887ab50 (13 Nov 2015)

cdda79e9 is not a commit in rARC or rPHU, and the last commit to libphutil was on 12 Nov (while that output shows a change on 13 Nov), and it's impossible for both libraries to have the same commit at HEAD. Is he running a forked version of arc with local modifications?

Okay, it turned out he installed Arcanist using brew, not sure why it caused the difference though. I have updated our wiki page asking people to install Arcanist by following the instruction at

Thanks for looking!