Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated contribution doc to indicate how to sync with upstream repository

Browse Source
This commit is contained in:
brybalicious 2020-10-09 01:53:22 +02:00
parent bdff6eb5c9
commit f271a9d0e3
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/ways_to_contribute.rst
View File

@ -90,8 +90,15 @@ The following example suggests how to contribute a feature.
git push -u origin feature/yourfeaturename git push -u origin feature/yourfeaturename
If it's been some time since performing steps 4 through 7, make sure to checkout 'develop' again and pull the latest changes from upstream before checking out and creating feature/yourfeaturename and pushing changes. Alternatively, checkout 'feature/yourfeaturename' and simply run:
.. code-block:: bash
git rebase upstream/develop
and your staged commits will be merged along with the changes.
.. Hint:: -u option sets up your locally created new branch to follow a remote branch which is now created with the same name on your remote repository. .. Hint:: -u option sets up your locally created new branch to follow a remote branch which is now created with the same name on your remote repository.
.. Note:: If it's been some time since performing steps 4 through 7, make sure to checkout 'develop' again and pull the latest changes from upstream before checking out and creating feature/yourfeaturename and pushing changes
11. Finally, create a new Pull/Merge Request on Gitlab to merge the remote version of this new branch with commited updates, back into the upstream develop branch, finalising the integration of the new feature. 11. Finally, create a new Pull/Merge Request on Gitlab to merge the remote version of this new branch with commited updates, back into the upstream develop branch, finalising the integration of the new feature.