QueteGit04

wilder@wilder-ThinkPad-T430s:~/Documents/QuetesPaul/GitHub/GitHub04$ git pull https://github.com/PaulCrtr/GitHub04
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), done.
From https://github.com/PaulCrtr/GitHub04
 * branch            HEAD       -> FETCH_HEAD
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
wilder@wilder-ThinkPad-T430s:~/Documents/QuetesPaul/GitHub/GitHub04$ git add README.md
wilder@wilder-ThinkPad-T430s:~/Documents/QuetesPaul/GitHub/GitHub04$ git commit
[master f925209] Merge https://github.com/PaulCrtr/GitHub04
wilder@wilder-ThinkPad-T430s:~/Documents/QuetesPaul/GitHub/GitHub04$ git pull https://github.com/PaulCrtr/GitHub04
From https://github.com/PaulCrtr/GitHub04
 * branch            HEAD       -> FETCH_HEAD
Already up to date.
wilder@wilder-ThinkPad-T430s:~/Documents/QuetesPaul/GitHub/GitHub04$ git push origin master
Username for 'https://github.com': PaulCrtr
Password for 'https://PaulCrtr@github.com':
Counting objects: 4, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (4/4), 471 bytes | 471.00 KiB/s, done.
Total 4 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 100% (1/1), done.
To https://github.com/PaulCrtr/GitHub04
   7d0aab7..f925209  master -> master