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,
which brings me to the second
part:
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 in Makefile).
it would then make sense to take Makefile.config outside of version
control.
typically configure generates Makefile.config. since it is different on
each machine
it does not make sense to track it in the origin repo.
good luck!
On Sun, 20 Nov 2011 18:55:02 +0100, Rustom Mody rustompm...@gmail.com
wrote:
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 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 git-users@googlegroups.com.
To unsubscribe from this group, send email to
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/git-users?hl=en.
