Reference blog: https://blog.csdn.net/nan7_/ article/details/25624637
Your local changes would be overwritten by merge. Commit, stage or revert them to proceed
Cause: git conflict
1. Use the GIT repository stash changes command to save your changes
At this time, you will find that the modified parts are gone and return to the original state
2、pull
Download the code on GIT
3、git-repository-Unstash changes
Take out your own code and compare and merge the code
In the comparison page, the version in Git library is on the left, the original version is in the middle, and your own version is on the right
Similar Posts:
- Please, commit your changes or stash them before you can merge
- Git Conflict error: Your local changes would be overwritten by merge. Commit, stash or revert them to proceed?
- [Solved] Git pull error: You have not concluded your merge (MERGE_HEAD exists)
- [Solved] Git conflict Error: commit your changes or stash them before you can merge
- A rejected – non fast forward error occurred in eclipse push
- A rejected – non fast forward error occurred in eclipse push
- Fatal: cannot do a partial commit during a merge
- [Solved] Java collections.sort Error: Comparison method violates its general contract!
- [Solved] Git pull fatal: refusing to merge unrelated histories