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,
The normal approach is pretty much what the error message says: Either
commit first, or stash the changes. Example of the latter approach:
$ git pull
error msg
$ git stash save
$ git pull
$ git stash pop
handle conflicts
--
You received this message because you are subscribed to the Google
On Saturday, November 19, 2011, Konstantin Khomoutov
flatw...@users.sourceforge.net wrote:
On Fri, 18 Nov 2011 12:20:03 -0800
PJ Weisberg p...@irregularexpressions.net wrote:
The more I think about it, though, the more I think I could probably
get away with using a timestamp for what I had in
I had similar problem with our customers - they are used to version
numbers. So we modified our history to keep the number of commits since
first adding.
--
You received this message because you are subscribed to the Google Groups Git
for human beings group.
To view this discussion on the
On Mon, Nov 21, 2011 at 1:01 AM, Thomas Ferris Nicolaisen
tfn...@gmail.comwrote:
The normal approach is pretty much what the error message says: Either
commit first, or stash the changes. Example of the latter approach:
$ git pull
error msg
$ git stash save
$ git pull
$ git stash pop
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
