Updated git (markdown) authored by Jens Hahn's avatar Jens Hahn
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
```git merge upstream/master``` ```git merge upstream/master```
## Merge messages ## Merge messages
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. 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' of https://www.github.com:*yourname*/Python_course.git```. 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** looks like this:
[[nano.png | height = 250px]] [[nano.png | height = 250px]]
... ...
......