Merge requests

A merge request proposes a branch for a target (the default branch unless set).

ermite mr create myrepo --source feature --title "Add feature"
ermite mr show myrepo 1 --diff
ermite mr merge myrepo 1 --head <commit> [--squash] [--delete-branch]

Fast-forward moves the target. Squash writes one commit signed by the server's SSH key.
The merge is refused when the branch moved since the reviewed --head, or when the target is not an ancestor of it.
With failing_checks_block on (default), the merge is refused while a check of the head failed or is still running.
--delete-branch deletes the source branch, unless it is the default branch or another open request uses it.
ermite repo edit --merge-modes limits the modes per repository.
Scopes: mr:write to open and comment, mr:merge to merge.

Verify squash commits with the allowed_signers line from ermite signing-key show:

git verify-commit <commit>

source

1# Merge requests
2
3A merge request proposes a branch for a target (the default branch unless set).
4
5```sh
6ermite mr create myrepo --source feature --title "Add feature"
7ermite mr show myrepo 1 --diff
8ermite mr merge myrepo 1 --head <commit> [--squash] [--delete-branch]
9```
10
11- **Fast-forward** moves the target. **Squash** writes one commit signed by the server's SSH key.
12- The merge is refused when the branch moved since the reviewed `--head`, or when the target is not an ancestor of it.
13- With `failing_checks_block` on (default), the merge is refused while a check of the head failed or is still running.
14- `--delete-branch` deletes the source branch, unless it is the default branch or another open request uses it.
15- `ermite repo edit --merge-modes` limits the modes per repository.
16- Scopes: `mr:write` to open and comment, `mr:merge` to merge.
17
18Verify squash commits with the `allowed_signers` line from `ermite signing-key show`:
19
20```sh
21git verify-commit <commit>
22```

merge-requests.md RawHistoryFolder

Merge requests

merge-requests.md Raw History Folder