B You need to rebase first and then commit. The purpose of rebase is to make your changes based on the modification of file A.
The root cause is that conflicts will occur in this case, and git cannot determine which version is the final version. If you only use merge, it will directly think that B has changed the A file back.
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
B You need to rebase first and then commit. The purpose of rebase is to make your changes based on the modification of file A.
The root cause is that conflicts will occur in this case, and git cannot determine which version is the final version. If you only use merge, it will directly think that B has changed the A file back.