>>> orbital ~/repos/POEMS $ arc land --conduit-uri=http://local.aphront.com:8080/
Landing current branch 'conflict'.
Switched to branch master. Updating branch...
The following commit(s) will be landed:
2d3f015 asdf
Switched to branch conflict. Identifying and merging...
Revision 'D100007: asdf' has not been accepted. Continue anyway? [y/N] y
Landing revision 'D100007: asdf'...
Harbormaster is still building the active diff for this revision:
PENDING Build 197: Many Sleeps
PENDING Build 196: Request And Wait
You can review build details here:
Harbormaster URI: http://local.aphront.com:8080/B177
Land revision anyway, despite ongoing build? [y/N] y
Rebasing conflict onto master
First, rewinding head to replay your work on top of it...
Applying: asdf
Using index info to reconstruct a base tree...
M hook.txt
Falling back to patching base and 3-way merge...
Auto-merging hook.txt
CONFLICT (content): Merge conflict in hook.txt
Failed to merge in the changes.
Patch failed at 0001 asdf
The copy of the patch that failed is found in:
/INSECURE/repos/POEMS/.git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
Usage Exception: 'git rebase master' failed. You can abort with 'git rebase --abort', or resolve conflicts and use 'git rebase --continue' to continue forward. After resolving the rebase, run 'arc land' again.
>>> orbital ~/repos/POEMS $ git status
# rebase in progress; onto bebe2a8
# You are currently rebasing branch 'conflict' on 'bebe2a8'.
# (fix conflicts and then run "git rebase --continue")
# (use "git rebase --skip" to skip this patch)
# (use "git rebase --abort" to check out the original branch)
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add <file>..." to mark resolution)
#
# both modified: hook.txt
#
no changes added to commit (use "git add" and/or "git commit -a")
>>> orbital ~/repos/POEMS $ arc land --conduit-uri=http://local.aphront.com:8080/
Usage Exception: Specify exactly one branch or bookmark to land changes from.