The code of my local warehouse is exactly the same as the code of the remote warehouse I want to update the branch node information of the local warehouse to the latest How can there be a conflict when executing git rebase origin api_new?
Git rebase is used to merge changes from one branch to the current branch. It is equivalent to your local branch being applied to the remote branch first, and then applying your local modifications to your local branch. If there is a conflict at this time, it means that the remote branch has been updated by someone else.
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
Git rebase is used to merge changes from one branch to the current branch. It is equivalent to your local branch being applied to the remote branch first, and then applying your local modifications to your local branch. If there is a conflict at this time, it means that the remote branch has been updated by someone else.