Changes

Page history
Update git basic setup -- fix iteration numbers authored by Marek Šabo's avatar Marek Šabo
Show whitespace changes
Inline Side-by-side
git-basic-setup.md
View page @ 91067631
...@@ -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
```bash ```bash
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-01 -X theirs
``` ```
> >
**In Netbeans:** **In Netbeans:**
...@@ -18,7 +18,7 @@ git pull origin iteration-00 -X theirs ...@@ -18,7 +18,7 @@ git pull origin iteration-00 -X theirs
# 1. Getting new iteration # 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-00, the next one is iteration-01, etc. 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.
**Attention:** Commit your previous changes before getting a new iteration (step 3)! Otherwise, the following process can fail. **Attention:** Commit your previous changes before getting a new iteration (step 3)! Otherwise, the following process can fail.
... ...
......