##// END OF EJS Templates
rhodecode-enterprise-ce
RSS
timezone: fix issues with timezone detection of current logic....
timezone: fix issues with timezone detection of current logic. - it was reported that in certain timezones e.g `US/Central` the generated offset was +19:00 which is incorrect and should be -05:00. - we now use a special library for detection of local timezone and use logic of pytz to calculate the offset - fixes #5371
marcink - - Load All Authors

File last commit:

r1:854a839a default
r2676:7fe5f77f default
Show More
fixing-common-commits.rst
31 lines | 1.2 KiB | text/x-rst | RstLexer
/ docs / collaboration / fixing-common-commits.rst
History | Annotation | Raw |Copy content |Copy permalink

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.

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