sharezza-conflict

➜  sharezza-conflict git:(master) 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/Lola-D/sharezza-conflict
   55f35c4..e73cad3  master     -> origin/master
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
➜  sharezza-conflict git:(master) ✗ git add .
➜  sharezza-conflict git:(master) ✗ git commit -m "accept LOCAL"
[master 5eb12ad] accept LOCAL
➜  sharezza-conflict git:(master) git pull
Already up to date.
➜  sharezza-conflict git:(master) git push origin master
Enumerating objects: 10, done.
Counting objects: 100% (10/10), done.
Delta compression using up to 12 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (6/6), 604 bytes | 604.00 KiB/s, done.
Total 6 (delta 0), reused 0 (delta 0)
To https://github.com/Lola-D/sharezza-conflict.git
   e73cad3..5eb12ad  master -> master
➜  sharezza-conflict git:(master)