##// END OF EJS Templates
u » pc » rhodecode-enterprise-ce-fork-pc
RSS

Fork of rhodecode-enterprise-ce

integrations: refactor/cleanup + features, fixes #4181...
integrations: refactor/cleanup + features, fixes #4181 * added scopes on integrations, scopes are: - repo only - repogroup children only - root repos only - global (any repo) * integrations schemas now have separate section for the settings (eg. slack) and options (eg. scope/enabled) * added descriptions to integration types * added icons to integration types * added 'create new' integration page * added scope of integration to integrations list * added breadcrumbs for each repo/repogroup/global integrations pages * added sorting to integrations list * added pagination to integrations list * added icons to integrations list * added type filter to integrations list * added message to integrations list if none we found * added extra permissions check on integrations views * db migration from 56 => 57 - adds child_repos_only field * added tests for integrations triggered on events * added tests for integrations schemas * added tests for integrations views for repo/repogroup/admin
marcink - - Load All Authors

File last commit:

r1:854a839a default
r731:7a6d3636 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: