Changeset View
Changeset View
Standalone View
Standalone View
src/workflow/ArcanistLandWorkflow.php
Show First 20 Lines • Show All 81 Lines • ▼ Show 20 Lines | return phutil_console_format(<<<EOTEXT | ||||
- the default remote in Mercurial. | - the default remote in Mercurial. | ||||
After selecting a target branch and a remote, the commits which will | After selecting a target branch and a remote, the commits which will | ||||
be landed are printed. | be landed are printed. | ||||
With **--preview**, execution stops here, before the change is | With **--preview**, execution stops here, before the change is | ||||
merged. | merged. | ||||
The change is merged into the target branch, following these rules: | The change is merged with the changes in the target branch, | ||||
following these rules: | |||||
In mutable repositories or with **--squash**, this will perform a | In repositories with mutable history or with **--squash**, this will | ||||
squash merge (the entire branch will be represented as one commit on | perform a squash merge (the entire branch will be represented as one | ||||
the target branch). | commit after the merge). | ||||
In immutable repositories or with **--merge**, this will perform a | In repositories with immutable history or with **--merge**, this will | ||||
strict merge (a merge commit will always be created, and local | perform a strict merge (a merge commit will always be created, and | ||||
commits will be preserved). | local commits will be preserved). | ||||
The resulting commit will be given an up-to-date commit message | The resulting commit will be given an up-to-date commit message | ||||
describing the final state of the revision in Differential. | describing the final state of the revision in Differential. | ||||
In Git, the merge occurs in a detached HEAD. The local branch | |||||
reference (if one exists) is not updated yet. | |||||
With **--hold**, execution stops here, before the change is pushed. | With **--hold**, execution stops here, before the change is pushed. | ||||
The change is pushed into the remote. | The change is pushed into the remote. | ||||
Consulting mystical sources of power, the workflow makes a guess | Consulting mystical sources of power, the workflow makes a guess | ||||
about what state you wanted to end up in after the process finishes | about what state you wanted to end up in after the process finishes | ||||
and the working copy is put into that state. | and the working copy is put into that state. | ||||
▲ Show 20 Lines • Show All 1,457 Lines • Show Last 20 Lines |