##// END OF EJS Templates
rhodecode-enterprise-ce
RSS
api: use consistent way to extract users, repos, repo groups and user groups by id or name....
api: use consistent way to extract users, repos, repo groups and user groups by id or name. - makes usage of Number vs String to differenciate if we pick objec ID or it's name this will allow easy fetching of objects by either id or it's name, including numeric string name - fixes #5230
marcink - - Load All Authors

File last commit:

r1:854a839a default
r1530:1efcb4ee default
Show More
merge-pull-request.rst
35 lines | 1.2 KiB | text/x-rst | RstLexer
/ docs / collaboration / merge-pull-request.rst
History | Annotation | Raw |Copy content |Copy permalink

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`.

../images/merge-pr-button.png

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: