git resolves Your local changes to the following files would is overwritten by merge:

Problem

In the same document, when you submit, someone updates the file and uploads it earlier than you so that your local file is not up-to-date. Therefore, when you want to upload your own modified files, the first step of Git pull, the following error is reported:

    error: Your local changes to the following files would be overwritten by merge:            src/test/resources/application_context.xml    Please, commit your changes or stash them before you can merge.    Aborting

To resolve this issue, do the following:

1. Git stash

   • Hide local Modifications

2. Git pull

   • Download the latest code

3. Git stash pop

   • Read the last saved content from the git stack and restore your local modifications

4. Prompt for conflict-free

   • If there is a conflict, resolve the conflict
   • If not, submit it directly
     • git add *
     • Git commit *-M "Comments"

git resolves Your local changes to the following files would is overwritten by merge: