コンフリクトした
.screenrcと.zshrcがconflictしたので手修正したあとに
sogo:# git add .screenrc sogo:# git add .zshrc sogo:# git commit -a Created commit c8c7b2a: Merge branch 'master' of git@github.com:honconn/dotfiles sogo:# git push Enter passphrase for key '/home/sogo/.ssh/id_rsa': Counting objects: 17, done. Compressing objects: 100% (9/9), done. Writing objects: 100% (9/9), 1.26 KiB, done. Total 9 (delta 5), reused 0 (delta 0) To git@github.com:honconn/dotfiles.git f05a6e2..c8c7b2a master -> master
解消した