Skip to content
Snippets Groups Projects
Commit aee6dd7c authored by Andrej Rasevic's avatar Andrej Rasevic
Browse files

Merge branch 'master' of gitlab.cs.umd.edu:arasevic/cmsc436fall2020-student into master

parents 17411e0e 2864e0fe
No related branches found
No related tags found
No related merge requests found
...@@ -33,7 +33,7 @@ __NOTE:__ while the origin url will vary and be unique for everyone the upstream ...@@ -33,7 +33,7 @@ __NOTE:__ while the origin url will vary and be unique for everyone the upstream
`upstream` is a common repository that everyone will be able to `pull` from and add new files and changes to existing files in their own repositories. Your access to this repository is read only - in terms of git commands this is analogous to `git pull`. You can write to your origin repository and this is analagous to `git push`. The flow for the course is we will add new started code for projects/exercises to `upstream` and then to receive them you will issue the following command: `upstream` is a common repository that everyone will be able to `pull` from and add new files and changes to existing files in their own repositories. Your access to this repository is read only - in terms of git commands this is analogous to `git pull`. You can write to your origin repository and this is analagous to `git push`. The flow for the course is we will add new started code for projects/exercises to `upstream` and then to receive them you will issue the following command:
`git pull upstream master` . `git pull upstream master` .
This command will add the changes in the `upstream` repository to your local compy of your repository. At this point your local repository and your `origin` will be different. You can verify this by running `git status`. You should see something along the lines of your local repository is 1 (or more) commits ahead of origin master. To resolve this you just need to run: This command will add the changes in the `upstream` repository to your local copy of your repository. At this point your local repository and your `origin` will be different. You can verify this by running `git status`. You should see something along the lines of your local repository is 1 (or more) commits ahead of origin master. To resolve this you just need to run:
`git push origin master`. Once that is done your local repository and your remote `origin` will be the same. `git push origin master`. Once that is done your local repository and your remote `origin` will be the same.
### submitting your work ### submitting your work
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment