Update git basic setup authored by Radek Ošlejšek's avatar Radek Ošlejšek
...@@ -9,7 +9,7 @@ In windows, use [git terminal app](https://git-for-windows.github.io/) applicati ...@@ -9,7 +9,7 @@ In windows, use [git terminal app](https://git-for-windows.github.io/) applicati
``` ```
git clone https://gitlab.fi.muni.cz/pb162/2017-pb162-seminar-project.git git clone https://gitlab.fi.muni.cz/pb162/2017-pb162-seminar-project.git
cd 2017-pb162-seminar-project cd 2017-pb162-seminar-project
git pull origin iteration-00 -X theirs git pull origin iteration-00 -X theirs --rebase
``` ```
> >
**In Netbeans:** **In Netbeans:**
...@@ -25,7 +25,7 @@ Every week, we add a new iteration with described assignment what you have to do ...@@ -25,7 +25,7 @@ Every week, we add a new iteration with described assignment what you have to do
If you want to get the assignment use pull command: If you want to get the assignment use pull command:
``` ```
git pull origin iteration-0X -X theirs git pull origin iteration-0X -X theirs --rebase
``` ```
> >
**In Netbeans:** **In Netbeans:**
... ...
......