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 @ f421b134
......@@ -4,21 +4,21 @@ 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).
* 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 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. Download initial project to your PC [optional]
In windows, use [git terminal app](https://git-for-windows.github.io/) application.
```bash
git clone https://gitlab.fi.muni.cz/pb162/2019-pb162-seminar-project.git
cd 2019-pb162-seminar-project
git clone https://gitlab.fi.muni.cz/pb162/2020-pb162-seminar-project.git
cd 2020-pb162-seminar-project
git pull origin iteration-01 -X theirs
```
# 1. Getting new iteration
Every week, we add a new iteration with described assignment what you have to do. The very first iteration is called iteration-01, the next one is iteration-02, etc.
Every week, we add a new iteration with the described assignment what you have to do. The very first iteration is called iteration-01, the next one is iteration-02, etc.
**Attention:** Commit your previous changes before getting a new iteration (step 3)! Otherwise, the following process can fail.
......@@ -36,11 +36,11 @@ git status
# 2. Implement the assignment
Follow [instructions on GitLab](https://gitlab.fi.muni.cz/pb162/2019-pb162-seminar-project/tree/master) (switch the branch `master` to `iteration-0X`)
Follow [instructions on GitLab](https://gitlab.fi.muni.cz/pb162/2020-pb162-seminar-project/tree/master) (switch the branch `master` to `iteration-0X`)
# 3. Saving changes
You can do it multiple times. Always check that you added/changed only classes mentioned in the assignment. Changing other classes may produce conflicts when downloading new iteration!
You can do it multiple times. Always check that you added/changed the only classes mentioned in the assignment. Changing other classes may produce conflicts when downloading new iteration!
```bash
git add -A && git commit -m "Shortly describe what have you done."
......
......