git (quete 4)

myrhn@myrhn-VirtualBox:~/workspace/quetes/git/EspriZza$ git pull
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), done.
From https://github.com/Mirubrys/EspriZza
   0958920..929b80d  master     -> origin/master
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
myrhn@myrhn-VirtualBox:~/workspace/quetes/git/EspriZza$ vim README.md
myrhn@myrhn-VirtualBox:~/workspace/quetes/git/EspriZza$ 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")
myrhn@myrhn-VirtualBox:~/workspace/quetes/git/EspriZza$ git add README.md
myrhn@myrhn-VirtualBox:~/workspace/quetes/git/EspriZza$ git commit -m "solved conflict"
[master 5155067] solved conflict
myrhn@myrhn-VirtualBox:~/workspace/quetes/git/EspriZza$ git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean
myrhn@myrhn-VirtualBox:~/workspace/quetes/git/EspriZza$ git pull
Already up to date.