Merge and resolve conflicts
When you merge an approved change request, its changes go live. Wiki also adds a new version to the history of the space.
Who can merge
To merge, you need Write access to the space and the Wiki Approver role, or the Wiki Manager role.
Merge an approved change
- Open a change request that is
Approved. - Click Merge.
The status changes to Merged and the changes are live. The author gets a notification.
If you can review in the space, you can also merge your own changes from the editor. Click Merge in the page header. Wiki submits, approves and merges your change request in one step.
Outdated change requests
A change request starts from the version of the space at that time. If someone merges other changes to the space later, the change request is outdated.
You can still merge an outdated change request. Wiki combines the two sets of changes:
- Changes to different pages merge without a problem.
- Changes to different lines of the same page also merge.
- Changes to the same part of the same page cause a conflict.
Conflicts
A conflict occurs when the live space and the change request both changed the same thing. Each conflict has a type:
| Type | Cause |
|---|---|
content |
Both changed the same lines of a page, or one deleted a page that the other edited. |
meta |
Both changed the same page setting, such as the title, the route or whether it is published. |
tree |
Both moved the same page to different places in the page tree. |
When you click Merge and Wiki finds conflicts, the change request stays Approved and the page shows Merge Conflicts.
Resolve conflicts
- Click a conflict to expand it. The diff shows the live page on the left and the change request on the right.
- Select Keep Main to keep the live page, or Keep Your Changes to use the page from the change request.
- Do this for each conflict. Wiki selects Keep Your Changes by default.
- Click Resolve & Merge.
Your choice applies to the whole page. Keep Main drops the change of this change request to that page. Keep Your Changes replaces the live page, so the other change to that page is lost.
If the space changed again while you resolved the conflicts, Wiki can find new conflicts and shows an error. Reload the page, click Merge again, and resolve the conflicts that Wiki shows.