using idea, you will find that its git is really convenient, but sometimes there are some inexplicable problems
1. Switch branch from local branch A to local branch B, pull branch B code to the latest, sometimes pull will find that the code has not been pulled down no matter what, indicating that there is no latest code. In fact, there are updates remotely, so you can only delete the local branch and then pull the remote branch
2 and merge branch from the new branch. Merge the B branch code to the A branch, and there is obviously a new file on the B branch, that is, the merge is not on the A branch