login: Bring recaptcha back to work. - Missed some template context variables needed for recaptcha to work. - Now reuse the register view in register_post when rendering the form with errors.

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r46:4bc0185d

default

Download file

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

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:

	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