jeremy@MacBook-Pro-de-Jeremy sharZza % git pull
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
jeremy@MacBook-Pro-de-Jeremy sharZza % git add .
jeremy@MacBook-Pro-de-Jeremy sharZza % git commit -m "resolv conflicts"
[master 63ceba1] resolv conflicts
jeremy@MacBook-Pro-de-Jeremy sharZza % git pull
Already up to date.
jeremy@MacBook-Pro-de-Jeremy sharZza % git push origin master
Enumerating objects: 10, done.
Counting objects: 100% (10/10), done.
Delta compression using up to 4 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (6/6), 539 bytes | 539.00 KiB/s, done.
Total 6 (delta 0), reused 0 (delta 0)
To https://github.com/Jerem-67/sharZza
   28904ae..63ceba1  master -> master
jeremy@MacBook-Pro-de-Jeremy sharZza %