1. Merger of git, when merging with tortoiseGit, you need to pull it again first, pull the original branch code, and then the target branch can be merged (different folders display different branches),
When the same folder switches branches to merge, it is not necessary to merge directly from the original branch
2. When there is a conflict, you can savetash first and cache the local changes, so that you can pull down other people's code, and then stash pops out. At this time, there will be conflicts, you can merge manually.