Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tom Nichols
pytreat-practicals-2020
Commits
4b267ef8
Commit
4b267ef8
authored
Mar 05, 2020
by
Sean Fitzgibbon
Browse files
Update README.md
parent
4d87f3b3
Changes
1
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
4b267ef8
...
...
@@ -98,6 +98,8 @@ repository (advanced).
5.
In gitlab, submit a merge request from your branch onto the master
branch.
https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html
### Using a fork of this repository (advanced)
...
...
@@ -130,6 +132,8 @@ repository (advanced).
6.
In gitlab, submit a merge request from your fork back to the upstream
repository.
https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html
### Updating your local repository
...
...
@@ -137,21 +141,22 @@ repository (advanced).
To bring in the changes that other people have contributed to the main
repository into your local repository:
```
git fetch --all
# make sure you are on the correct local branch - if you followed the
# instructions above and are working on a branch within the main repository:
git checkout my_cool_branch
```
# Or if you are working on a fork of the main repository:
git checkout master
Then, do this if you are working on a branch within the main repository:
# Do this if you are working on a branch within the main repository
```
# make sure you are on the correct local branch:
git checkout my_cool_branch
git merge origin/master
```
# Or do this if you are working on a fork of the main repository
Or, do this if you are working on a fork of the main repository:
```
git checkout master
git merge upstream/master
```
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment