zoukankan      html  css  js  c++  java
  • git 解决push报错:[rejected] master -> master (fetch first) error: failed to push some refs to

    今天对代码进行了修改优化,然后往往远程push,但push后报错了

    git操作

    git add .
    git commit -m"fix"
    git push origin master:dev-gaochao

    报错信息

    To https://amc-msra.visualstudio.com/trading-algo/_git/real-trading
     ! [rejected]        master -> dev-gaochao (fetch first)
    error: failed to push some refs to 'https://amc-msra.visualstudio.com/trading-algo/_git/real-trading'
    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.

    原因

    之所以出现这个原因,是因为我在线上生成、编辑了README.md文件,而本地代码文件中不包含它,所以线上线下就对不上了。

    解决

    将线上、线下代码进行合并

    git pull --rebase origin dev-gaochao

    然后再进行push

    git push origin master:dev-gaochao

    成功:

    Enumerating objects: 11, done.
    Counting objects: 100% (11/11), done.
    Delta compression using up to 4 threads
    Compressing objects: 100% (7/7), done.
    Writing objects: 100% (7/7), 1.90 KiB | 487.00 KiB/s, done.
    Total 7 (delta 4), reused 0 (delta 0)
    remote: Analyzing objects... (7/7) (13 ms)
    remote: Checking for credentials and other secrets... (1/1) done (1008 ms)
    remote: Storing packfile... done (157 ms)
    remote: Storing index... done (87 ms)
    To https://amc-msra.visualstudio.com/trading-algo/_git/real-trading
       1919525..6f3asa4dd6  master -> dev-gaochao
  • 相关阅读:
    104.Maximum Depth of Binary Tree
    103.Binary Tree Zigzag Level Order Traversal
    102.Binary Tree Level Order Traversal
    101.Symmetric Tree
    100.Same Tree
    99.Recover Binary Search Tree
    98.Validate Binary Search Tree
    97.Interleaving String
    static静态初始化块
    serialVersionUID作用
  • 原文地址:https://www.cnblogs.com/bigtreei/p/10180383.html
Copyright © 2011-2022 走看看