My project use sourcetree to push and pull commits from a git repository. When i pull a remote commit, i meet an error message like this : Your local changes to the following files would be overwritten by merge, Please commit your changes or stash them before you merge.
* branch master -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
PythonExampleProject/.pydevproject
PythonExampleProject/com/.../mongo/MongoDBConnect.py
Please commit your changes or stash them before you merge.
Aborting
Updating 31bddd97..ea752301
Completed with errors, see above
After investigate, i finally find the method to fix this error, and the pull remote commits action perform successfully. Below is the steps.
- Select the files in sourcetree which are not committed to repository server.
- Right click them and click Reset to Commit menu item in the popup menu. This menu item will discard those not pushed committed changes.
- Click OK button in the next 2 popup dialog. Then you can click the pull icon in top sourcetree tool bar to pull commits from remote repository.
