2. 1、BUG
    3. root@bfire:~/geeknote# geeknote login
    4. >>> : Authorize...Traceback (most recent call last):
    5.  File "/usr/local/lib/python2.7/dist-packages/geeknote-0.2a-py2.7.egg/geeknote/geeknote.py", line 883, in main
    6.    User().login(**ARGS)
    7.  File "/usr/local/lib/python2.7/dist-packages/geeknote-0.2a-py2.7.egg/geeknote/geeknote.py", line 35, in wrapper
    8.    return func(*args, **kwargs)
    9.  File "/usr/local/lib/python2.7/dist-packages/geeknote-0.2a-py2.7.egg/geeknote/geeknote.py", line 397, in login
    10.    if self.getEvernote().auth():
    11.  File "/usr/local/lib/python2.7/dist-packages/geeknote-0.2a-py2.7.egg/geeknote/geeknote.py", line 151, in auth
    12.    self.authToken = GNA.getToken()
    13.  File "/usr/local/lib/python2.7/dist-packages/geeknote-0.2a-py2.7.egg/geeknote/oauth.py", line 132, in getToken
    14.    self.getTmpOAuthToken()
    15.  File "/usr/local/lib/python2.7/dist-packages/geeknote-0.2a-py2.7.egg/geeknote/oauth.py", line 150, in getTmpOAuthToken
    16.    oauth_callback="https://" + self.url['base']
    17.  File "/usr/local/lib/python2.7/dist-packages/geeknote-0.2a-py2.7.egg/geeknote/oauth.py", line 103, in loadPage
    18.    conn.request(method, uri, params, headers)
    19.  File "/usr/lib/python2.7/httplib.py", line 962, in request
    20.    self._send_request(method, url, body, headers)
    21.  File "/usr/lib/python2.7/httplib.py", line 996, in _send_request
    22.    self.endheaders(body)
    23.  File "/usr/lib/python2.7/httplib.py", line 958, in endheaders
    24.    self._send_output(message_body)
    25.  File "/usr/lib/python2.7/httplib.py", line 818, in _send_output
    26.    self.send(msg)
    27.  File "/usr/lib/python2.7/httplib.py", line 780, in send
    28.    self.connect()
    29.  File "/usr/lib/python2.7/httplib.py", line 1165, in connect
    30.    self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file)
    31.  File "/usr/lib/python2.7/ssl.py", line 381, in wrap_socket
    32.    ciphers=ciphers)
    33.  File "/usr/lib/python2.7/ssl.py", line 143, in __init__
    34.    self.do_handshake()
    35.  File "/usr/lib/python2.7/ssl.py", line 305, in do_handshake
    36.    self._sslobj.do_handshake()
    37. error: [Errno 104] Connection reset by peer
    40. http://git-scm.com/docs/git-log
    42. 02、解决git bash与vim 中文乱码问题
    44. 1、vim的，直接修改git自带的vim下的vimrc配置文件即可。
    45. 在git安装目录\share\vim\vimrc 文件中加入：
    46. set fileencodings=utf-8,ucs-bom,cp936,big5
    47. set fileencoding=utf-8
    48. set termencoding=gbk
    50. 2. 编辑 git-completion.bash 文件：$ vi git-completion.bash
    52.    最下面添加
    54. alias ls='ls --show-control-chars --color=auto' #ls能够正常显示中文  
    56. 3. 编辑 inputrc 文件：$ vi inputrc
    58.    修改 output-meta 和 convert-meta 属性值
    60. set output-meta on #bash中可以正常输入中文  
    61. set convert-meta off  
    63. 4. 编辑 profile 文件：$ vi profile
    65.    最下面添加
    67. export LESSHARSET=utf-8  
    69. 5. 重新编译配置文件，使文件生效
    71.    $ source git-completion.bash
    73.    $ source inputrc
    75.    $ source profile
    77. 03、error: failed to push some refs to 'git@github.com:archermind/LEDTorch.apk-for-Android.git'
    79. http://like-eagle.iteye.com/blog/1742246
    81. 1、注册github账号并创建仓库。
    82. 注册好帐号，比如我的用户名是liweiyitou
    83. 创建一个新的仓库(Repository)，例如theone
    84. 2、将工程文件夹(比如theone)拷贝至C:\Sites\下。
    85. 3、执行git命令提交代码至Github。
    86. git init
    87. git add .
    88. git commit -m "first" -a
    89. git remote add origin https://github.com/liweiyitou/theone.git
    90. git push origin master
    91. ###在之后git控制台提示中继续再输入github的用户名和密码即可push代码成功哦\(^o^)/~
    92. 解释：
    93. 在当前目录初始化
    94. 添加所有文件
    95. 提交，first是提交时的注释
    96. 要把网址换为你建立的Repository的网址，github网站上能查到
    97. push到github
    98. =========================================
    99. 代码冲突"! [rejected] master -> master (non-fast-forward)"的原因以及解决办法：
    100. ①博文选摘之一
    101. 如下文章选摘自博文：http://blog.csdn.net/mci2004/article/details/7763399
    102. 最近想把自己做的一个小小小小的应用放到github上去，顺便学习下git和玩玩github，我用两台电脑往github上的项目push代码，想模拟social coding的感觉。呵呵，但是出现了这个错误 ：
    103. To git@github.com:archermind/LEDTorch.apk-for-Android.git  
    104. ! [rejected]        master ->  master (non-fast-forward)  
    105. error: failed to push some refs to 'git@github.com:archermind/LEDTorch.apk-for-Android.git'  
    106. To prevent you from losing history, non-fast-forward updates were rejected  
    107. Merge the remote changes before pushing again.  See the 'Note about  
    108. fast-forwards' section of 'git push --help' for details.  
    109. 错误产生的原因是，因为我在A电脑上向github上的项目push过代码，而又在B电脑上修改了代码并且要push到github上去，这个时候，git为了避免冲突的发生，rejected。
    110.        正确的做法是，在push之前git fetch origin，将github上的新代码拉下来，然后在本地merge，如果没有冲突就可以push了，如果有冲突的话要在本地解决冲突后，再push。具体做法就是。
    111. git fetch origin
    112. git merge origin/master
    113. ###这两步其实可以简化为git pull origin master
    114. git push origin master
    115. ②博文选摘之二
    116. Git错误non-fast-forward后的冲突解决
    117. 博文转载：http://blog.csdn.net/chain2012/article/details/7476493
    118. 当要push代码到git时，出现提示：
    119. error:failed to push some refs to ...
    120. Dealing with "non-fast-forward" errors
    121. From time to time you may encounter this error while pushing:
    122. $ git push origin master  
    123. To ../remote/  
    124. ! [rejected]        master -> master (non-fast forward)  
    125. error: failed to push some refs to '../remote/'  
    126. To prevent you from losing history, non-fast-forward updates were rejected
    127. Merge the remote changes before pushing again.  See the 'non-fast forward'
    128. section of 'git push --help' for details.
    129. This error can be a bit overwhelming at first, do not fear. Simply put, git cannot make the change on the remote without losing commits, so it refuses the push. Usually this is caused by another user pushing to the same branch. You can remedy this by fetching and merging the remote branch, or using pull to perform both at once.
    130. In other cases this error is a result of destructive changes made locally by using commands like git commit --amend or git rebase. While you can override the remote by adding --force to the push command, you should only do so if you are absolutely certain this is what you want to do. Force-pushes can cause issues for other users that have fetched the remote branch, and is considered bad practice. When in doubt, don't force-push.
    132. 问题（Non-fast-forward）的出现原因在于：git仓库中已经有一部分代码，所以它不允许你直接把你的代码覆盖上去。于是你有2个选择方式：
    133. 1，强推，即利用强覆盖方式用你本地的代码替代git仓库内的内容
    134. git push -f
    135. 2，先把git的东西fetch到你本地然后merge后再push
    136. $ git fetch
    137. $ git merge
    138. 这2句命令等价于
    139. $ git pull  
    140. 可是，这时候又出现了如下的问题：
    142. 上面出现的 [branch "master"]是需要明确(.git/config)如下的内容
    143. [branch "master"]
    144.    remote = origin
    145.    merge = refs/heads/master
    146. 这等于告诉git2件事:
    147. 1，当你处于master branch, 默认的remote就是origin。
    148. 2，当你在master branch上使用git pull时，没有指定remote和branch，那么git就会采用默认的remote（也就是origin）来merge在master branch上所有的改变
    149. 如果不想或者不会编辑config文件的话，可以在bush上输入如下命令行：
    150. $ git config branch.master.remote origin  
    151. $ git config branch.master.merge refs/heads/master  
    152. 之后再重新git pull下。最后git push你的代码吧。it works now~
    154. 4\git lab Permission denied 错误解决方案
    156. 使用git clone工程的时候，遇到以下错误
    158. Shell代码  收藏代码
    159. [user@host ~]$ git clone user@gitlab.xx.com:projectname/proj.git  
    160. Cloning into itemcenter-all...  
    161. user@gitlab.xx.com's password:  
    162. Permission denied, please try again.  
    163. user@gitlab.xx.com's password:  
    164. Permission denied, please try again.  
    165. user@gitlab.xx.com's password:  
    166. Permission denied (publickey,password,keyboard-interactive).  
    167. fatal: The remote end hung up unexpectedly  
    170. 经过查阅发现是ssh模式不支持 用户名+密码 验证，需要调整gitlab服务器ssh配置。
    172. Shell代码  收藏代码
    173. vi /etc/ssh/sshd_config  
    174. #修改这一行  
    175. #PasswordAuthentication no  
    176. PasswordAuthentication yes  
    179. 也可以客户端使用http模式绕过
    180. Shell代码  收藏代码
    181. [user@host ~]$ git clone http://gitlab.xx.com/projectname/proj.git