Commit a7bbaba9 authored by Alan O'Cais's avatar Alan O'Cais
Browse files

Use more familiar "upstream" for remote

parent c8454c6d
Pipeline #234 passed with stages
in 31 seconds
......@@ -57,8 +57,8 @@ Pull the master branch from the main repository:
.. code-block:: bash
cd Classical-MD-Modules
git remote add gitlab_ecam https://git@gitlab.e-cam2020.eu/e-cam/Classical-MD-Modules.git
git pull gitlab_ecam master
git remote add upstream https://git@gitlab.e-cam2020.eu/e-cam/Classical-MD-Modules.git
git pull upstream master
Keep your master branch up-to-date
----------------------------------
......@@ -68,7 +68,7 @@ Make sure you update it every time you create a feature branch (see below):
.. code-block:: bash
git checkout master
git pull gitlab_ecam master
git pull upstream master
Branching
---------
......@@ -155,7 +155,7 @@ To update your contribution you update the appropriate files on your contributio
git branch # List all available local branches, to include remote branches add the -r flag
git checkout <BRANCH_NAME> # Check out the branch we want to update
git pull origin <BRANCH_NAME> # Make sure we have any updates we made to our own branch
git pull gitlab_ecam master # Also pull in any changes to the main repository
git pull upstream master # Also pull in any changes to the main repository
Now that everything is in sync, you can edit your update your files, when you are finished you commit your changes and push the changes back to GitLab
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment