git revert doesn‘t solve conflicts

1. Problem

When I tried to revert to a certain commit which was several commits behind, I failed and showed conflicts. I was wondering why there were conflicts for the revert. I mean there definitely should be some conflicts because that's why I used git revert. It feels so weird that git revert doesn't solve the conflicts automatically. 

2. the cause of the problem

Then I found out the reason was that git revert doesn't reverse to a certain commit. What it actually does is to only revert the changes in that commit. So a better way to say is that git revert reverts a commit instead of that git revert reverts to a commit.

3. Solution

The solution is simple. Just keep reverting the current commit each time until you get the certain commit. After that, we are able to git commit and push to the repo.

  • 0
    点赞
  • 0
    收藏
    觉得还不错? 一键收藏
  • 0
    评论

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

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

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

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

抵扣说明:

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

余额充值