merge-pull-request.rst
35 lines
| 1.2 KiB
| text/x-rst
|
RstLexer
Merge a |pr|
|RCM| can detect if it can automatically merge the changes in a |pr|. If it can, you will see the following message: :guilabel:`This pull request can be automatically merged.` To merge, click the big blue button! To enable this feature, see :ref:`server-side-merge`.
If you cannot automatically merge a |pr|, you will see one of the following messages:
- :guilabel:`This pull request cannot be merged because of conflicts`
- :guilabel:`Reviewer approval is pending`
Manual Merge a |PR|
If |RCM| cannot safely merge the changes in a |pr|, usually due to conflicts, you need to manually merge the changes on the command line. You can see more information for each |repo| type at the following links: