zoukankan      html  css  js  c++  java
  • 我遇到的一些Git问题汇编

    问题一:

    failed to push some refs to git

    hint: Updates were rejected because the remote contains work that you do

    hint: not have locally. This is usually caused by another repository pushing

    hint: to the same ref. You may want to first integrate the remote changes

    hint: (e.g., 'git pull ...') before pushing again.

    hint: See the 'Note about fast-forwards' in 'git push --help' for details.

    解决方法:

      
    出现错误的主要原因是github中的README.md文件不在本地代码目录,可以通过如下命令进行代码合并【注:pull=fetch+merge],

    这一步会从远端仓库拉下来你的文件,可能会删除本地重要文件,可根据需要另外保存。

    git pull --rebase origin master
    

    执行上面代码后可以看到本地代码库中多了README.md文件,接下来可以正常提交。

    如果还不行,可以尝试强制提交(存在安全风险,但是个人用户无所谓):

    git push --force-with-lease origin master:master
    

      这样就可以上传了。

    问题二:

    committing is not possible because you have unmerged files

    hint: Fix them up in the work tree, and then use 'git add/rm <file>'

    hint: as appropriate to mark resolution and make a commit.

    解决方法:

    不需要添加committing ,因为你的文件还没有并入远端。

    使用下面代码上传:

    git add 你的文件名以及后缀
    git push origin master
    

     

     

  • 相关阅读:
    python 3.x报错:No module named 'cookielib'或No module named 'urllib2'
    Xshell实现Windows和使用跳板机跳转的远程Linux互传文件
    Linux scp常用命令
    正则表达式
    [NBUT 1458 Teemo]区间第k大问题,划分树
    [hdu5416 CRB and Tree]树上路径异或和,dfs
    [vijos P1008 篝火晚会]置换
    [hdu5411 CRB and Puzzle]DP,矩阵快速幂
    [hdu4713 Permutation]DP
    [hdu4710 Balls Rearrangement]分段统计
  • 原文地址:https://www.cnblogs.com/Hangingter/p/11460155.html
Copyright © 2011-2022 走看看