rhodecode-enterprise-ce Files · docs/collaboration/merge-pull-request.rst

artifacts: expose a special auth-token based artifacts download urls....

artifacts: expose a special auth-token based artifacts download urls. This will allow sharing download to external locations used new generated artifact download tokens. This feature allows also serving downloads using secret urls with all the fancy logic of our auth tokens.

marcink - - Load All Authors

File last commit:

r3290:ac4e4e5a default


                r4003:09f31efc

default

Download file

             merge-pull-request.rst
        
                    35 lines
            
             | 1.2 KiB
            
                | text/x-rst
            
             |
                RstLexer
            
             / docs / collaboration / merge-pull-request.rst
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marcink
    
project: added all source files and assets

              r1
            
      .. _merge-requests-ref:

      Merge a |pr|

      ------------

        marcink
    
docs: added SAML documentation....

              r3290
            
      |RCE| can detect if it can automatically merge the changes in a |pr|. If it

        marcink
    
project: added all source files and assets

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

      .. image:: ../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-requests-ref:

      Manual Merge a |PR|

      ^^^^^^^^^^^^^^^^^^^

        marcink
    
docs: added SAML documentation....

              r3290
            
      If |RCE| cannot safely merge the changes in a |pr|,

        marcink
    
project: added all source files and assets

              r1
            
      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:

      * `Git Manual Merging`_

      * `Mercurial Manual Merging`_

      * `Subversion Manual Merging`_

      .. _Git Manual Merging: http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

      .. _Mercurial Manual Merging: http://hgbook.red-bean.com/read/a-tour-of-mercurial-merging-work.html

      .. _Subversion Manual Merging: http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

marcink project: added all source files and assets	r1	.. _merge-requests-ref:

		Merge a \|pr\|
		------------

marcink docs: added SAML documentation....	r3290	\|RCE\| can detect if it can automatically merge the changes in a \|pr\|. If it
marcink project: added all source files and assets	r1	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`.

		.. image:: ../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-requests-ref:

		Manual Merge a \|PR\|
		^^^^^^^^^^^^^^^^^^^

marcink docs: added SAML documentation....	r3290	If \|RCE\| cannot safely merge the changes in a \|pr\|,
marcink project: added all source files and assets	r1	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:

		* `Git Manual Merging`_
		* `Mercurial Manual Merging`_
		* `Subversion Manual Merging`_

		.. _Git Manual Merging: http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
		.. _Mercurial Manual Merging: http://hgbook.red-bean.com/read/a-tour-of-mercurial-merging-work.html
		.. _Subversion Manual Merging: http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html