Push Preview
Wyrm never pushes straight away. Push in the top bar opens a preview of what will change on the remote, and nothing is sent until you confirm.
Open the preview
Section titled “Open the preview”Click Push in the top bar. Wyrm opens Push to origin (or whichever remote you push to) and lists your tracked bookmarks.
The preview compares your bookmarks with the remote as Wyrm last saw it. If teammates may have pushed since, click Fetch first.
Read the preview
Section titled “Read the preview”Each bookmark row has a status:
| Status | Meaning |
|---|---|
| New | The bookmark doesn’t exist on the remote yet. |
| Update | A fast-forward: the remote gets your new commits on top of what it has. |
| Delete | You deleted the bookmark locally; the push deletes it on the remote. |
| Diverged | Your bookmark and the remote one have gone separate ways. jj won’t push until you decide what to do. |
| Up to date | Nothing to push. |
| Needs description / Has conflicts | A commit being pushed has no description, or has unresolved conflicts. Fix it first. |
| Untracked | The bookmark exists on the remote but isn’t tracked locally. Track and push sets that up once. |
Tick or untick bookmarks to choose what goes in this push. If the repository has several remotes, pick them under Remotes. Tags you’ve created get their own Tags section; only checked tags are pushed.
Diverged bookmarks
Section titled “Diverged bookmarks”Click Resolve divergence on a diverged row. Wyrm shows both histories and offers:
- Force-push mine: replace the remote bookmark with yours. Wyrm recommends this when the difference looks like your own rewrite (Looks like a rewrite.).
- Rebase onto remote: put your commits on top of the remote’s. Usually the safest choice otherwise.
- Merge remote into local
- Reset to remote: drop your version and take the remote’s.
Force-pushing is always this explicit choice. jj won’t overwrite a remote bookmark that moved since your last fetch.
Confirm
Section titled “Confirm”Click Push 1 bookmark (or Push N bookmarks), or press ⌘↩. Esc cancels; nothing has been applied yet.
After the push, the remote-tracking labels in the log (such as main@origin) move to show where the remote now is.