... | ... | @@ -22,4 +22,10 @@ |
|
|
* **delete uncommited** changes: ```git checkout .```
|
|
|
* **update forked** repo:
|
|
|
```git fetch upstream```
|
|
|
```git merge upstream/master``` |
|
|
\ No newline at end of file |
|
|
```git merge upstream/master```
|
|
|
|
|
|
## Merge messages
|
|
|
Usually, after the ```git merge```, git will open a text editor where you can type in a **commit message**. That is the description of your commit. In Windows this should be ***notepad*** which is pretty easy to handle. In the Linux terminal the text editors can be a bit more difficult to handle because they work only with keyboard and not with a mouse.
|
|
|
|
|
|
**nano** looks like this:
|
|
|
[[nano.png]] |
|
|
\ No newline at end of file |