Merge a pull request

RhodeCode Enterprise can detect if it can automatically merge the changes in a pull request. If it can, you will see the following message: This pull request can be automatically merged. To merge, click the big blue button! To enable this feature, see Enabling Server-side Merging.

../_images/merge-pr-button.png

If you cannot automatically merge a pull request, you will see one of the following messages:

  • This pull request cannot be merged because of conflicts
  • Reviewer approval is pending

Manual Merge a pull request

If RhodeCode Enterprise cannot safely merge the changes in a pull request, usually due to conflicts, you need to manually merge the changes on the command line. You can see more information for each repository type at the following links: