> This is only for students who use "odevzdávárna IS".
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 (e.i. precisely follow the workflow instructions listed below).
***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.
# 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.
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
...
...
@@ -55,5 +55,5 @@ git show # after commit
# 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.
