WCS - Git/GitHUB 5 - Merge & Conflicts

gistfile1.txt

flo@kubuntu:~/Documents/Wild Code School/quests/Git/merge-conflicts$ git pull
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
flo@kubuntu:~/Documents/Wild Code School/quests/Git/merge-conflicts$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   README.md

no changes added to commit (use "git add" and/or "git commit -a")
flo@kubuntu:~/Documents/Wild Code School/quests/Git/merge-conflicts$ git commit -a -m "resolved conflicts"
[master 1ba3ca1] resolved conflicts
flo@kubuntu:~/Documents/Wild Code School/quests/Git/merge-conflicts$ git pull
Already up to date.
flo@kubuntu:~/Documents/Wild Code School/quests/Git/merge-conflicts$ git push origin master
Enumerating objects: 8, done.
Counting objects: 100% (8/8), done.
Delta compression using up to 2 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (4/4), 399 bytes | 399.00 KiB/s, done.
Total 4 (delta 2), reused 0 (delta 0)
remote: Resolving deltas: 100% (2/2), completed with 1 local object.
To https://github.com/barthflo/merge-conflicts.git
   98c8890..1ba3ca1  master -> master
flo@kubuntu:~/Documents/Wild Code School/quests/Git/merge-conflicts$