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

Fork of rhodecode-enterprise-ce

threading: Add factory that creates curl session for each thread....
threading: Add factory that creates curl session for each thread. When creating a repo with an import url pointing to another repo on the same enterprise instance we call the vcssserver to check the url. The vcsserver then calls to enterprise to verify the url. This leads to two threads using the same cur session.
marcink - - Load All Authors

File last commit:

r1:854a839a default
r243:dae685be 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: