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 @ 2c9cc15c
...@@ -30,7 +30,7 @@ git pull origin iteration-0X -X theirs ...@@ -30,7 +30,7 @@ git pull origin iteration-0X -X theirs
> >
**In Netbeans:** **In Netbeans:**
* Team -> Remote -> Pull... * Team -> Remote -> Pull...
* Select Configured Git Repository Location: `https://gitlab.fi.muni.cz/pb162/2017-pb162-seminar-project.git` * Select Configured Git Repository Location: `origin:https://gitlab.fi.muni.cz/pb162/2017-pb162-seminar-project.git`
* Remote Branches: `iteration-0X -> munijava/iteration-0X` (check **only** required iteration, e.g. iteration-01). * Remote Branches: `iteration-0X -> munijava/iteration-0X` (check **only** required iteration, e.g. iteration-01).
* Merge. * Merge.
> >
... ...
......