When I am working with a certain git repo I need to make a 1 line
change to the Makefile (for adapting to my paths)
So then whenever I do git pull I get
error: Your local changes to the following files would be overwritten by merge:
Please, commit your changes or stash them before you can merge.
What is the normal approach to solving this?
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to email@example.com.
To unsubscribe from this group, send email to
For more options, visit this group at