Skip to main content
A pull request (PR) proposes merging one branch into another. It gives you a page to see the changes, discuss them, get them reviewed by people and by Archie Reviewer, resolve conflicts, and merge. The Frontend and every Logic service have their own pull requests. To see the list, select Pull requests in the branch menu, or open the Pull requests tab of Manage branches. In a service, select the pull requests count under the service header.
A merge never publishes your site and never deploys a service. The PR page reminds you: “This does not publish the site. Publish from Publish site” for the Frontend, and “This does not deploy the service. Deploy from Deploy” for a service.

Open a pull request

  1. Switch to the branch that has your changes and select Open pull request in the branch menu.
  2. Choose From, the branch with the changes, and Into, the branch that receives them. Protected targets are marked protected.
  3. Add a Title and a Description. Both are optional.
  4. Check the summary: commits, files, lines changed, and any predicted conflicts.
  5. Select Open PR.
A few things to know:
  • You cannot open a pull request from a protected branch. The menu says “Open pull requests from a working branch, not from a protected one.”
  • The dialog tells you when the target has commits your branch does not have.
  • If there is nothing to merge, or a pull request already exists for the same two branches, the dialog says so and points you to it.
  • The dialog has an Archie review checkbox. It is checked unless the Code review setting of your project is Never. When it is checked, the button reads Open PR · Archie review from N credits. Clear the checkbox to open the PR without a review. If the target requires Archie’s review, you can request it later from the PR. See Archie Reviewer.
The list shows Open and Closed tabs. Each row shows the pull request, its Author, its Branches, and its State: Open, Conflicts, Merging, Merged, or Closed.

The pull request page

The Merge status panel says whether you can merge and what is missing, for example Approvals missing or Archie hasn’t reviewed yet. It also says whether there are conflicts with the target.

Reviews

Request a review

In Reviewers, select Request review. Choose people from the project (project owners, admins, and editors), Archie Reviewer, or both, then select Request. Reviewers show as Pending until they answer. If the branch changes after someone approved, their review is marked Outdated: new commits since.

Review the changes

  1. Select Review changes.
  2. Choose one verdict: Approve, Request changes, or Comment.
  3. Add a Summary if you want, then select Submit review.
You cannot approve or request changes on your own pull request, but you can comment. If the branch moved since you loaded the diff, you are asked to review the new changes before you approve. On the Changes tab, select Comment on this line to start a thread. You can resolve a thread and reopen it with Reopen. The PR counts its unresolved threads.

Apply suggestions

Reviewers, including Archie, can attach a Suggestion to a line. Select Apply to apply one. To apply several in one commit, select Add to batch on each and then Apply selected. The bar shows the maximum number of suggestions per commit. Applying a suggestion is free. A suggestion cannot be applied in these cases:
  • The code changed since the review. Apply it by hand or request another review.
  • It was already applied.
  • Two suggestions change the same lines.
  • The branch you would write to is protected.

Fix in chat

On a review comment, select Fix in chat to send the comment to the chat so it fixes the code on the source branch of the PR. If the comment belongs to a different branch than the one you are on, the button reads Fix in chat · switches to and Archie switches you to that branch. The button is not offered when the source branch is protected, because the chat cannot write there.

Conflicts

A conflict happens when both branches changed the same part of a file. Conflicts never stop you from opening a pull request. Archie predicts them and opens a merge workspace where you resolve them. On the Conflicts tab, Resolve conflicts (N) lists the files that need a decision.
  • For text conflicts, resolve them in the code editor or ask the chat. The file then shows Resolved in the editor or Resolved with the chat.
  • For files that cannot be merged line by line, such as binary files, files that one side deleted, and files Archie generated, choose which version stays: Use source or Keep target. Choosing a side replaces the whole file, including edits you made by hand.
When every file has a decision, select Complete merge into target. The dialog counts the files you decided and the files without a decision, which Archie checks in case you resolved them in the editor. If the target changed while you were resolving, new conflicts may remain. Select Recalculate merge to start again from the latest source. Anything you resolved by hand is lost.

Merge

When Merge status says Ready to merge into target, select Merge into target. The dialog shows the result, either a fast-forward with no merge commit or a merge commit in the target, and how many commits enter. A merge is blocked while the rules of the target are not met: missing approvals, a missing or outdated Archie review, requested changes, or unresolved conflicts. Merge status lists what is missing. After the merge, the PR moves to Merged, with a link to View in History. The merge can take a few seconds to be ready in the target. The page says “Finishing entering target”, and nobody can write to the target until it finishes. If it takes longer than usual, the page offers Retry.

Merge without a pull request

A protected branch without rules can be merged into directly, without a PR.
  1. In Manage branches, open the row menu of the branch with your changes.
  2. Select Merge directly into target.
  3. Check the Source and the Target and confirm with Merge into target.
A direct merge works only as a fast-forward: the target moves only if your branch contains everything that is in the target. Otherwise you see “target moved since source was created” and you need to bring the target’s changes into your branch, or open a pull request. A branch with rules always requires a pull request.

Close a pull request

Select Close PR to close a pull request without merging it. The title, description, and reviews stay on the closed pull request, and you can open another one whenever you want. Closing a pull request that has conflicts also deletes its merge workspace and what you resolved there. Only the person who opened the pull request, or an Owner or Admin, can close it. See Permissions.

Next steps