gistfile1.txt

~/Workspace/lbpk/community  where
  allans_lbpk
* lbpk
  master
  remotes/origin/HEAD -> origin/master
  remotes/origin/lbpk
  remotes/origin/lbpk_ui
  remotes/origin/master
  remotes/origin/serverctl
~/Workspace/lbpk/community  git commit -m 'merge conflict  (git was complaining about divergence and rebasing and I didn't want to take any chances so I created a new branch based on my diverged lbpk branch, and named it allans_lbpk.   Then I merged allans_lbpk into emanuele's lbpk.  Will delete allans_lbpk after this merge)'
fatal: cannot do a partial commit during a merge.
~/Workspace/lbpk/community 