Git conflict resolution

Git conflict resolution

Reproduced from https://www.cnblogs.com/jason-beijing/p/5718190.html scene one
User0 has a new submission
User1 no pull---write new code---pull-and prompt conflicting

Workaround One
Stash Save (Save your own code), re-pull---stash pop (retrieve the hidden code saved), the code file will show the conflict right-click Edit conficts Page of Mark as resolved-Commit&push

Solution two (use as little as possible, the advantage of this approach is to deal with conflicts in the original editor, the code logic to see more clearly)
-Stash Save (Save your own code), re-pull, stash pop (retrieve the hidden code saved), the code file will show the conflict--right-click Select Resolve Conflict-> ; Open file conflict Resolution-Commit&push


Scene Two
User0 has a new submission
User1 no pull--write new code--Commit&push--prompt there is a conflict

Workaround One
The pull-and code file will show conflict-right-click on edit Conficts, and after you have clicked on the editing page, mark as resolved, Commit&push