Update git basic setup authored by Radek Ošlejšek's avatar Radek Ošlejšek
...@@ -2,39 +2,37 @@ ...@@ -2,39 +2,37 @@
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. 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. Getting repository with assignments # 0. Getting initial project to your PC [optional]
Download repository to your PC and go to that directory (use [git terminal app](https://git-for-windows.github.io/) for Windows): In windows, use [git terminal app](https://git-for-windows.github.io/) application.
``` ```
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
``` ```
> >
**In Netbeans:** **In Netbeans:**
* Team -> Other VCS -> Git -> Clone... * Make the first step on a command line in order to avoid troubles
* Repository URL: https://gitlab.fi.muni.cz/pb162/2017-pb162-seminar-project.git
* Clone into: choose your preferred path, but **in Windows use disk J (home)** – it won't work otherwise.
* Next -> Check _iteration-00_ -> Next -> Finish
> >
# 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-00, the next one is iteration-01, etc.
**Attention:* Commit your previous changes before getting a new iteration (see 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.
If you want to get the assignment use pull command: If you want to get the assignment use pull command:
``` ```
git pull origin iteration-00 -X theirs git pull origin iteration-0X -X theirs
``` ```
> >
**In Netbeans:** **In Netbeans:**
* Team -> Remote -> Pull... * Team -> Remote -> Pull...
* Select Configured Git Repository Location: `munijava:https://gitlab.fi.muni.cz/pb162/2017-pb162-seminar-project.git` * Select Configured Git Repository Location: `munijava:https://gitlab.fi.muni.cz/pb162/2017-pb162-seminar-project.git`
* Remote Branches: `iteration-0X -> munijava/iteration-0X [A]` (check **only** current iteration, e.g. iteration-00). * Remote Branches: `iteration-0X -> munijava/iteration-0X` (check **only** required iteration, e.g. iteration-01).
* Merge. * Rebase.
> >
To make sure that everything is okay, use `git status`, which is pretty useful: To make sure that everything is okay, use `git status`, which is pretty useful:
... ...
......