Changes

Page history
Update git basic setup authored by Radek Ošlejšek's avatar Radek Ošlejšek
Show whitespace changes
Inline Side-by-side
git-basic-setup.md
View page @ 3ac0ac70
> This is only for students who use "odevzdávárna IS". > This is only for students who use "odevzdávárna IS".
Follow two important rules to prevent conflicts in the source code: Follow two important rules to prevent conflicts in the source code:
* Never change files that you do not have to change according to the assignment (or, at least, return the changes before requesting the final merge). * **Never change files that you do not have to change** according to the assignment (or, at least, return the changes before requesting the final merge).
* Always commit your changes before pulling new iteration (e.i. precisely follow the workflow instructions listed below). * Always **commit your changes** before pulling new iteration (i.e. precisely follow the workflow instructions listed below).
If you have a trouble getting the assignment, you can always go to GitLab project and download ZIP file. Then just extract it into your directory and you should have your new iteration ready. If you have a trouble getting the assignment, you can always go to GitLab project and download ZIP file. Then just extract it into your directory and you should have your new iteration ready.
# 0. Downloading initial project to your PC [optional] # 0. Download initial project to your PC [optional]
In windows, use [git terminal app](https://git-for-windows.github.io/) application. In windows, use [git terminal app](https://git-for-windows.github.io/) application.
```bash ```bash
git clone https://gitlab.fi.muni.cz/pb162/2018-pb162-seminar-project.git git clone https://gitlab.fi.muni.cz/pb162/2019-pb162-seminar-project.git
cd 2018-pb162-seminar-project cd 2019-pb162-seminar-project
git pull origin iteration-01 -X theirs git pull origin iteration-01 -X theirs
``` ```
...@@ -36,7 +36,7 @@ git status ...@@ -36,7 +36,7 @@ git status
# 2. Implement the assignment # 2. Implement the assignment
Follow [instructions on GitLab](https://gitlab.fi.muni.cz/pb162/2018-pb162-seminar-project/tree/master) (switch the branch `master` to `iteration-0X`) Follow [instructions on GitLab](https://gitlab.fi.muni.cz/pb162/2019-pb162-seminar-project/tree/master) (switch the branch `master` to `iteration-0X`)
# 3. Saving changes # 3. Saving changes
...@@ -55,5 +55,5 @@ git show # after commit ...@@ -55,5 +55,5 @@ git show # after commit
# 4. Submitting your code # 4. Submitting your code
Go to the project directory, create a ZIP file and upload it to the IS according to your teacher's instructions. If you get a feedback from your teacher requesting to repair something in your code, repeat steps 2 and 3. Go to the project directory, create a ZIP file and upload it to the IS according to your teacher's instructions. If you get feedback from your teacher requesting to repair something in your code, repeat steps 2 and 3.