Forums

error: Your local changes to the following files would be overwritten by merge:

Hi,

Could you please tell me how we commit our changes or stash from the console. In my case, I modified settings.py, therefore git asks me to commit or stash this file. What can I do to pull and overwrite my settings.py. Many thanks in advance for your help,

Gilles

The command git stash will revert all uncommitted changes in the repository that you're in, and then you can use git pull to pull down any changes from your remote repository.

Once you've done that, if you don't want the changes that you stashed, then you don't need to do anything more. If you want to re-apply them, then use git stash pop to re-apply the changes on top of the newly-pulled code.

Thank you giles for this prompt answer.

Best regards,

Gilles