FreeKB - Git (Version Control) Resolve "your local changes to 'path/to/file' would be overwritten by merge"
Git (Version Control) - Resolve "your local changes to 'path/to/file' would be overwritten by merge"

This occurs when issuing the git pull command.

error: Your local changes to 'path/to/file' would be overwritten by merge.  Aborting.
Please, commit your changes or stash them before you can merge.

 

The git checkout command can be used to overwrite the local copy of the file in your branch (master) with the file in the origin Git repository.

git checkout 'path/to/file'

 

 

Add a Comment




We will never share your name or email with anyone. Enter your email if you would like to be notified when we respond to your comment.




Please enter 8e435 in the box below so that we can be sure you are a human.




Comments

Web design by yours truely - me, myself, and I   |   jeremy.canfield@freekb.net   |