There are many ways to resolve conflict. Find one that is comfortable to use
Git pull Your local changes to the following files would be overwritten by merge: XXX /…
2. Git Stash backups up the contents of the current workspace, reading from the last commit and keeping the workspace consistent with the last commit. At the same time, save the current workspace contents to Git stack.
3. Git pull pull the code from the server
4. Git Stash pop: Retrieve the most recently saved content from the Git stack and restore the workspace. Since there can be multiple Stash contents, a stack is used to manage the contents, and pop reads from the nearest Stash and restores the contents.
Then resolve the conflict in the code and commit
Also, git Stash List: Displays all backups in your Git stack. You can use this list to decide where to restore from.
Git Stash clear: Clears the Git stack. At this point, graphic tools such as GITg can be used to find out which stash nodes have disappeared.
The original link: www.jianshu.com/p/920ad324f…
= = =