Changes
Page history
Update git basic setup
authored
Sep 05, 2018
by
Radek Ošlejšek
Show whitespace changes
Inline
Side-by-side
git-basic-setup.md
View page @
b5f1bb96
...
...
@@ -11,10 +11,6 @@ git clone https://gitlab.fi.muni.cz/pb162/2017-pb162-seminar-project.git
cd
2017-pb162-seminar-project
git pull origin iteration-01
-X
theirs
```
>
**In Netbeans:**
*
Make the first step on a command line in order to avoid troubles
>
# 1. Getting new iteration
...
...
@@ -27,23 +23,12 @@ If you want to get the assignment use pull command:
```
bash
git pull origin iteration-0X
-X
theirs
```
>
**In Netbeans:**
*
Team -> Remote -> Pull...
*
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).
*
Merge.
>
To make sure that everything is okay, use
`git status`
, which is pretty useful:
```
bash
git status
```
>
**In Netbeans:**
*
Check _View->Show Versioning Labels_ to see a current branch, changed classes, etc.
>
# 2. Implement the assignment
...
...
@@ -56,11 +41,6 @@ You can do it multiple times. Always check that you added/changed only classes m
```
bash
git add
-A
&&
git commit
-m
"Shortly describe what have you done."
```
>
**In NetBeans:**
*
Team -> Commit...
*
Commit Message:
`Shortly describe what have you done.`
>
Then you can look at your changes what you have done
```
bash
...
...
...
...