git develop删除后是否可以checkout到最新origin/develop

Question

本地develop被污染之后，我删除本地develop，再从远端拉一个最新的develop下来

做法：

  git branch -d develop
  
  git checkout develop
  

这样 在合了本地的develop和fixbug之后，push上了Git库

但是出现了 2天前 别人代码的commit 和我的冲突

请问怎么回事？

Answer 1

Why delete the local develop branch? Isn’t it ok to reset to remote develop?

git reset --hard origin/develop

If there is a conflict, resolve the conflict

Answer 2

There are a few questions about the description
1. You have deleted the local develop. Why can you still merge it?
2. Conflicts shouldn’t be considered abnormal, right? After all, when you fix the bug, you may modify the same file as someone else modified