zoukankan      html  css  js  c++  java
  • 使用GitGUI创建上传本地工程

    参考链接:

            使用Git-GUI创建工程

            http://jingyan.baidu.com/article/27fa732683ebf546f8271f2e.html


    一、刚创建的github版本库,在push代码时出错:

    $ git push -u origin master
    To git@https://github.com/wishchin/SlamWishG2O.git
     ! [rejected] master -> master (non-fast-forward)
    error: failed to push some refs to 'git@https://github.com/wishchin/SlamWishG2O.git'
    hint: Updates were rejected because the tip of your current branch is behind
    hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
    hint: before pushing again.
    hint: See the 'Note about fast-forwards' in 'git push --help' for details.

    网上搜索了下,是因为远程repository和我本地的repository冲突导致的,而我在创建版本库后,在github的版本库页面点击了创建README.md文件的按钮创建了说明文档,但是却没有pull到本地。这样就产生了版本冲突的问题。

    有如下几种解决方法:

    1.使用强制push的方法:

          $ git push SlamWishG2O master -f 
    这样会使远程修改丢失,一般是不可取的,尤其是多人协作开发的时候。

    2.push前先将远程repository修改pull下来

          $ git pull SlamWishG2O master
          $ git push -u SlamWishG2O master

    3.若不想merge远程和本地修改,可以先创建新的分支:

          $ git branch [name]

    然后push
          $ git push -u SlamWishG2O [name]

  • 相关阅读:
    资源与锁
    资源与锁
    Leetcode-Rotate List
    Leetcode-Unique Paths II
    Leetcode-Unique Paths
    Leetcode-Minimum Path Sum
    Leetcode-Sqrt(x)
    Leetcode-Set Matrix Zeroes
    Leetcode-Search a 2D Matrix
    Leetcode-Combinations
  • 原文地址:https://www.cnblogs.com/wishchin/p/9200068.html
Copyright © 2011-2022 走看看