ShareZzaNewrepo git:(master) git pull
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/juliusDum/ShareZzaNewrepo
   b7f467c..60a5244  master     -> origin/master
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
➜  ShareZzaNewrepo git:(master) ✗ code .
➜  ShareZzaNewrepo git:(master) ✗ git pull
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
➜  ShareZzaNewrepo git:(master) ✗ gst
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")
➜  ShareZzaNewrepo git:(master) ✗ git add README.md
➜  ShareZzaNewrepo git:(master) ✗ git commit  -m "second commit local"
[master 137a171] second commit local
➜  ShareZzaNewrepo git:(master) git pull
Already up to date.
➜  ShareZzaNewrepo git:(master) 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), 551 bytes | 551.00 KiB/s, done.
Total 6 (delta 0), reused 0 (delta 0)
To https://github.com/juliusDum/ShareZzaNewrepo.git
   60a5244..137a171  master -> master
➜  ShareZzaNewrepo git:(master)