michael@x071:[/data/prj/aixtools/cloud-init/branch]git push aixtools
Counting objects: 4, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 722 bytes | 0 bytes/s, done.
Total 4 (delta 3), reused 0 (delta 0)
To ssh://git.launchpad.net/~aixtools/cloud-init
   65e01b4..dc6e7b4  master -> master
michael@x071:[/data/prj/aixtools/cloud-init/branch]git checkout hash-bang
Switched to branch 'hash-bang'
Your branch and 'aixtools/hash-bang' have diverged,
and have 4 and 3 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
michael@x071:[/data/prj/aixtools/cloud-init/branch]git pull
Auto-merging tools/mock-meta.py
CONFLICT (content): Merge conflict in tools/mock-meta.py
Automatic merge failed; fix conflicts and then commit the result.