じゃあ、お先にしつれします !
few
February 09, 2010 ~ December 28, 2011
200 messages
Sora Harakami
(09:48:29) [$hq] fewc: sora_harakami: --tee option API
(09:48:30) [$hr] fewc: sora_harakami: fix specs API
(09:48:31) [$hs] fewc: sora_harakami: Write --tee spec API
Sora Harakami
body {
white-space: pre;
line-height: 7px;
font-size: 12pt;
font-family: "menlo regular", "monaco", "courier", monospace;
}
Sora Harakami
% git push origin master
To git@github.com:ujihisa/few.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:ujihisa/few.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again. See the 'non-fast-forward'
section of 'git push --help' for details.
Sora Harakami
Unpacking objects: 100% (59/59), done.
From github.com:ujihisa/few
* branch master -> FETCH_HEAD
Auto-merging bin/few
CONFLICT (content): Merge conflict in bin/few
Automatic merge failed; fix conflicts and then commit the result.
Sora Harakami
% git diff
/Users/sorah/local/bin/few:164: syntax error, unexpected tLSHFT
<<<<<<< HEAD
^
/Users/sorah/local/bin/few:175: syntax error, unexpected tEQQ, expecting keyword_end
=======
^
/Users/sorah/local/bin/few:183: syntax error, unexpected tRSHFT, expecting keyword_end
>>>>>>> 079e5c0345d7bbd8955a3256fef77514b48b22db
^
/Users/sorah/local/bin/few:183: Invalid octal digit
>>>>>>> 079e5c0345d7bbd8955a3256fef77514b48b22db
^
/Users/sorah/local/bin/few:291: syntax error, unexpected $end, expecting keyword_end
ujihisa
$ git pull [23:22:03]
OpenSSL version mismatch. Built against 9080ff, you have 1000001f
fatal: The remote end hung up unexpectedly