u/pc/rhodecode-enterprise-ce-fork-pc Files · docs/collaboration/fixing-common-commits.rst

login: Fix password reset mail link. - Pyramid needs the request object to generate an URL. - Therefore we generate the URL in the view and pass it to the model to send the email.

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r37:0ef0b0cc

default

Download file

             fixing-common-commits.rst
        
                    31 lines
            
             | 1.2 KiB
            
                | text/x-rst
            
             |
                RstLexer
            
             / docs / collaboration / fixing-common-commits.rst
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marcink
    
project: added all source files and assets

              r1
            
      .. _merging-empty-repo-ref:

      Merging Forks with an Empty Repository

      ======================================

      When a new repository is created, it has no commits. If the empty repository is

      forked, neither |repo| will have any shared information to link them together,

      making it impossible to create a |pr| to merge them.

      To avoid this problem, create an initial commit on the new repository before

      forking it. It can be accomplished, for example, by adding a README file to the

      master repository and commiting it to the server before forking.

      In case the fork was already made and you are unable to push or merge due to the

      lack of a common commit between both repositories, the following steps would

      enable you to fix this problem.

      1. Create a commit on the master repository.

      2. Pull the changes from the fork to the master repository, and rebase them

         on top of the new commit.

          .. code-block:: bash

             #pull from the fork into master

             $ hg pull -r fork-commit-id

      3. If the changes were made locally, push the changes to the server.

      4. On the forked repository, pull the changes from master.

      Now you should be able to create a |pr| or merge between both repositories.

	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	.. _merging-empty-repo-ref:

		Merging Forks with an Empty Repository
		======================================

		When a new repository is created, it has no commits. If the empty repository is
		forked, neither \|repo\| will have any shared information to link them together,
		making it impossible to create a \|pr\| to merge them.

		To avoid this problem, create an initial commit on the new repository before
		forking it. It can be accomplished, for example, by adding a README file to the
		master repository and commiting it to the server before forking.

		In case the fork was already made and you are unable to push or merge due to the
		lack of a common commit between both repositories, the following steps would
		enable you to fix this problem.

		1. Create a commit on the master repository.
		2. Pull the changes from the fork to the master repository, and rebase them
		on top of the new commit.

		.. code-block:: bash

		#pull from the fork into master
		$ hg pull -r fork-commit-id

		3. If the changes were made locally, push the changes to the server.
		4. On the forked repository, pull the changes from master.

		Now you should be able to create a \|pr\| or merge between both repositories.