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:
Makefile
Please, commit your changes or stash them
is it a repo that you only use or a repo where you contribute to?
if you only receive (git pull) but never contribute (git push),
then i would commit your changes locally. then subsequent updates will be
merged with
your local change until somebody else modifies and git pushes the path,
On Sun, Nov 20, 2011 at 11:59 PM, radovan bast radovan.b...@uit.no wrote:
is it a repo that you only use or a repo where you contribute to?
if you also contribute to the repo then i would change your Makefile:
separate it into a generic part and a specific part (Makefile.config,
included
