Refs T3929 - If arc is merging it will say merging * into * vs always saying rebasing * onto *
Details
Details
- Reviewers
epriestley - Group Reviewers
Blessed Reviewers - Maniphest Tasks
- Restricted Maniphest Task
- Commits
- rARC14f2f7fdd204: Arc output the correct action being taken
Make arc do a rebase, then a merge
Diff Detail
Diff Detail
- Lint
Lint Skipped - Unit
Tests Skipped
Event Timeline
Comment Actions
Won't this make it print out both messages? i.e., it will print:
Rebasing.. Merging...
Am I just crazy? I just woke up so let me know if I'm just misreading.
| src/workflow/ArcanistLandWorkflow.php | ||
|---|---|---|
| 604 | I'd expect that the rebase message should go above this line. | |
Comment Actions
That's what happens after I try to do a quick ticket after just waking up.
Moved the rebase echo below if (shouldUpdatewithRebase).
Comment Actions
Closed by commit rARC14f2f7fdd204 (authored by @guywarner, committed by @epriestley).