git-basic-setup.md

@@ -25,14 +25,14 @@ 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:
 
 ```bash
-git pull origin iteration-0X -X theirs --rebase
+git pull origin iteration-0X -X theirs
 ```
 >
 **In Netbeans:**
 * Team -> Remote -> Pull...
 * Select Configured Git Repository Location: `munijava: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).
-* Rebase.
+* Merge.
 >
 
 To make sure that everything is okay, use `git status`, which is pretty useful: