Your branch and ‘origin/master‘ have diverged,and have 1 and 353 different commits each, respective

最新推荐文章于 2024-03-14 11:00:15 发布
最新推荐文章于 2024-03-14 11:00:15 发布
阅读量1.5k 收藏 3
点赞数
分类专栏： git 文章标签： java 开发语言
版权声明：本文为博主原创文章，遵循 CC 4.0 BY-SA 版权协议，转载请附上原文出处链接和本声明。
本文链接：https://blog.csdn.net/thlzjfefe/article/details/125703777
版权

今天打开以前的一个项目，其他同事在维护，自己想更新下最新代码，然后执行拉取了下，竟然报错了：

git pull origin master

From ssh://test.com:1198/~test/test
 * branch            master     -> FETCH_HEAD
Auto-merging pom.xml
CONFLICT (content): Merge conflict in pom.xml
Auto-merging test-parent/pom.xml
CONFLICT (content): Merge conflict in test-parent/pom.xml
Removing test-stu/.gitignore
Auto-merging test-core/pom.xml
CONFLICT (content): Merge conflict in test-core/pom.xml
Automatic merge failed; fix conflicts and then commit the result.

然后clean了下：git clean -f   

再次拉取依然报错

接着按照提示：git merge --abort  

报错信息依旧

然后，查看了下状态

git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 353 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean

由于之前本地修改过代码并提交过，且服务器上代码重构优化变动非常大，不想花时间处理冲突了，果断还原，还原方式如下：

1、> git rebase origin/master
   Successfully rebased and updated refs/heads/master.

2、git pull --rebase
    remote: Enumerating objects: 402, done.
    remote: Counting objects: 100% (348/348), done.
    remote: Compressing objects: 100% (187/187), done.
    remote: Total 210 (delta 91), reused 0 (delta 0)
    Receiving objects: 100% (210/210), 20.74 KiB | 558.00 KiB/s, done.
    Resolving deltas: 100% (91/91), completed with 28 local objects.
    From ssh://test:1198/~test/test
     * [new branch]      10.0.1.1         -> origin/10.0.1.1 
     * [new branch]      8.6.1.1           -> origin/8.6.1.1 
     * [new tag]         10.0.0.1          -> 10.0.0.1 
     * [new tag]         5.0.2.1           -> 5.0.2.1 
    Already up to date.

3、>git push origin master
   Everything up-to-date


4、>git status
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean

thlzjfefe
关注
  • 0
    点赞
  • 踩
  • 3
    收藏
    觉得还不错? 一键收藏
  • 0
    评论
专栏目录
deep domain adaptation tutorial-small.pdf
09-17
Deep domain adaptation has emerged as a new learning technique to address the lack of massive amounts of labeled data. Compared to conventional methods, which learn shared feature subspaces or reuse important source instances with shallow representations, deep domain adaptation methods leverage deep networks to learn more transferable representations by embedding domain adaptation in the pipeline of deep learning. There have been comprehensive surveys for shallow domain adaptation, but few timely reviews the emerging deep learning based methods. In this paper, we provide a comprehensive survey of deep domain adaptation methods for computer vision applications with four major contributions. First, we present a taxonomy of different deep domain adaptation scenarios according to the properties of data that define how two domains are diverged. Second, we summarize deep domain adaptation approaches into several categories based on training loss, and analyze and compare briefly the state-of-the-art methods under these categories. Third, we overview the computer vision applications that go beyond image classification, such as face recognition, semantic segmentation and object detection. Fourth, some potential deficiencies of current methods and several future directions are highlighted
---解决git pull 后出现冲突的解决方法
weixin_30527323的博客
04-19 420
0. git statusOn branch masterYour branch and 'origin/master' have diverged,and have 1 and 3 different commits each, respectively. (use "git pull" to merge the remote branch into yours) 这是分支产生了分叉现象（...
Git常见问题记录：git出现“Your branch and ‘origin/master‘ have diverged”的解决方法【详细解释】
最新发布
今日七分甜的博客
03-14 1269
说明您的本地子分支和master主分支已经分叉，有冲突产生！push。
Your branch and 'origin/master' have diverged, and have # and # different commits each, respectively
KingOfMyHeart的博客
09-23 5577
一．如标题，当git有如上提醒时，意思是需要rebase或者merge了，具体情况如下： When you have a message like: “Your branch and ‘origin/master’ have diverged, # and have 1 and 1 different commit(s) each, respectively.” check if you need...
Android代码-EteSync
08-06
EteSync - Secure Data Sync Secure, end-to-end encrypted, and privacy respecting sync for your contacts, calendars and tasks (Android client). Overview Please see the EteSync website for more information. EteSync is licensed under the GPLv3 License. Third Party Code EteSync's source code was originally based on DAVdroid but the codebases has since diverged quite significantly. This project relies on many great third party libraries. Please take a look at the app's about menu for more informa
git提交出现Your branch and ‘origin/master‘ have diverged解决方法
weixin_55876727的博客
10-08 1万+
取消修改，只要执行下面两步： git fetch origin git reset --hard origin/master 当我们在本地提需要交到远程仓库的时候使用如下命令： 1.git rebase origin/master 然后使用 2.git pull --rebase 最后使用 3.git push origin master 把内容提交到远程仓库上。 ...
Git问题总结
qq_38856939的博客
03-07 1689
Git问题总结 分支分叉问题 执行 git status 或者 git push 时出现了以下错误： On branch master Your branch and 'origin/master' have diverged, and have 1 and 2 different commits each, respectively. (use "git pull" to merge the remote branch into yours) nothing to commit, working t
Git常见问题：Your branch and ‘xxx/xxx‘ have diverged
hl_java的专栏
03-09 1924
Your branch and ‘xxx/xxx‘ have diverged
git Your branch and xxx have diverged
柔情岁月的博客
06-18 5038
git Your branch and ‘origin/aaaaa_test’ have diverged Git 冲突解决办法： 查看与哪个版本冲突 $git cherry origin/aaaaa_test + b402fb3da8e7263dc756d075b3aa7afd604c3de5 可以看到与版本：b402fb3da8e7263dc756d075b3aa7afd604c3de5冲突了，找到这个版本之前的那个版本： git log 4. 回退到冲突前的版本： git r
git中遇到的问题
光头强的博客
12-19 1926
一、分支已经分叉 Your branch and 'origin/master' have diverged, and have 1 and 1 different commits each, respectively 翻译：您的分支和“origin/master”已经分叉，分别有1个和1个不同的提交 解决方案： git rebase用于把一个分支的修改合并到当前分支。 1、git re...
The Econometric Modelling of Financial Time Series 3rd
11-26
CAMBRIDGE UNIVERSITY PRESS 2008 In the nine years since the manuscript for the second edition of The Econometric Modelling of Financial Time Series was completed there have continued to be many advances in time series econometrics, some of which have been in direct response to features found in the data coming from financial markets, while others have found ready application in financial fields. Incorporating these developments was too much for a single author, particularly one whose interests have diverged from financial econometrics quite significantly in the intervening years! Raphael Markellos has thus become joint author, and his interests and expertise in finance now permeate throughout this new edition, which has had to be lengthened somewhat to accommodate many new developments in the area.
Academic Packing for Commercial FPGA Architectures 2017.pdf
08-17
With a few exceptions, academic packing algorithms for FPGAs are typically applied solely to theoretical architectures. This has allowed the algorithms to focus on the basic components of packing while abstracting away many of the details dictated by real hardware. As commercially available FPGAs have advanced, however, the academic algorithms and architectures have diverged significantly from their commercial counterparts. In this dissertation, the RapidSmith 2 framework is presented. This framework accurately reflects the architecture of Xilinx FPGAs and provides support for integrating custom tools into the commercial CAD tools. Using this framework, the RSVPack packing algorithm is implemented. The RSVPack algorithm can accept a design synthesized using the commercial Xilinx CAD tools, pack designs which make use of the many features of commercial FPGA architectures and return the packed designs to the Xilinx CAD tools to be placed and routed in their software. This enables researchers to isolate the packing portion of the algorithm from the commercial flow and evaluate different packing techniques while allowing the high-quality commercial tools to perform the remainder of the flow. Integrating the RSVPack algorithm the commercial flow shows RSVPack produces packing which lead to circuits with minimum clock periods within 10%, on average, of circuits generated using the pure Xilinx flow.
UnderstandingThe Linux Virtual Memory Manager
02-19
Linux is developed with a strong practical emphasis more than a theoretical one. When new algorithms are suggested or existing implementations questioned, it is common to request code to match the argument. Many of the algorithms used in the Virtual Memory (VM) system were designed by theorists but the implementations have now diverged from the theory considerably.很经典详解linux的虚拟内存管理
git使用问题之Your branch and 'origin/master' have diverged
yhc166188的博客
05-15 6966
1、问题描述: 在我们pull代码时，有时候会意外的在vim上出现如下提示（其实就是pull失败了） “ Your branch and 'origin/master' have diverged, (use "git pull" to merge the remote branch into yours) nothing to commit, working tree clean ” ...
git出现Your branch and ‘origin/master‘ have diverged解决方法
热门推荐
猛犸象
12-08 1万+
如果不需要保留本地的修改，只要执行下面两步： git fetch origin git reset --hard origin/master 当我们在本地提交到远程仓库的时候，如果遇到上述问题，我们可以首先使用如下命令： git rebase origin/master 然后使用 git pull --rebase 最后使用 git push origin master 把内容提交到远程仓库上。 ...
Your branch and ‘origin/master‘ have diverged, and have 1 and 3 different commits each, 情景一
大洋哥
10-22 1931
很多不懂的命令不要随便敲，切记切记 分析原因： 有可能是因为在团队开发过程中，一般都是拉本地的一些分支开发的； 在这过程中有队友可能在远程A总分支上修改的代码，导致出现这个提示； 解决办法； 先提交本地的代码，然后切换到远程A分支上，git pull 拉代码；最后再切换回我们本地的代码就可以操作了； ...
Your branch and 'origin/master' have diverged, and have 1 and 3 different commits each, respectively
qq_20488317的博客
06-05 3826
遇到这种报错之后想回到matser上面，则执行git fetch origingit reset --hard origin/master
Git问题Everything up-to-date解决
LXC
08-17 7270
出现这个问题的原因是git提交改动到缓存，要push的时候不会将本地所有的分支都push掉，所以出现这个问题。我们应该告诉git提交哪个分支。 这里有种特殊的情况是如果你是fork别人的仓库再clone到本地的话，即使git上只有一个主分支，他还是可能出现这个错误。那么我们就需要新建分支提交改动然后合并分支。 接下来先创建一个新分支提交改动 [html] view plain
这啥意思 Your branch and 'origin/branch1' have diverged, and have 79 and 117 different commits each, respectively. (use "git pull" to merge the remote branch into yours)
07-15
这个错误信息说明你的本地分支和远程分支（`origin/branch1`）已经发生了分歧（diverged），它们分别有79个和117个不同的提交（commits）。 这通常是因为在你本地分支和远程分支之间存在不同的提交历史，可能是由于...

“相关推荐”对你有帮助么？

  • 非常没帮助
  • 没帮助
  • 一般
  • 有帮助
  • 非常有帮助
提交
评论
添加红包

请填写红包祝福语或标题

个

红包个数最小为10个

元

红包金额最低5元

当前余额3.43元 前往充值 >
需支付：10.00元
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付元
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明：

1.余额是钱包充值的虚拟货币，按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载，可以购买VIP、付费专栏及课程。

余额充值