Problems encountered when using sourceTree:
Develop operation acquisition-"Pull
In the pull operation, there will always be a pop-up box. If you select the rebase in the pop-up box, there will be conflicts, which are endless.
In order to avoid this situation, the solution:
1. Save: Make a package and save the development content of your own development branch.
2. Undo all changes in your own branch
3. Switch to the develop branch, perform the acquisition operation in develop-"Pull operation
4. Switch to your own development branch, select the develop branch-"Right-click to select-"Reflect the current changes to develop. [This step is to update the latest development code to the local RBGJ-15158 branch]
