... | ... | @@ -25,7 +25,12 @@ |
|
|
```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.
|
|
|
Usually, after the ```git merge```, git will open a text editor where you can type in a **commit message**, git suggests a message like ```Merge branch master```. 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 |
|
|
[[nano.png | height = 250px]]
|
|
|
To exit it you have to press **```<Strg>+O```** to save and **```<Strg>+X```** to exit
|
|
|
|
|
|
**vi** looks like this:
|
|
|
[[vi.png | height = 250px]]
|
|
|
To exit it you have to press **```<Esc>```** than **```:wq```** to save and quit |
|
|
\ No newline at end of file |