Hi,
I am a newbie with GIT. I previously only had experience with CVS and SVN.
I am working with some other people on a common project, with some main
common source, called "origin", or what in GIT is called "master" (I
think). I got my local working copy by using "git clone".
Now, in my local working copy I sometimes make small changes only for
myself (for readability, like newlines, or more spaces or tabs, or small
comments). However, I also want to stay up-to-date with the main "master
code", so I want to do a "git -pull". What I expected what would happen is
that git would warn me that there are some conflicts (in my local working
code) and I would have to edit these conflicts out from my local code.
Which is fine with me.
But, instead of that, GIT gives me the following error:
[CODE]
error: Your local changes to the following files would be overwritten by
merge:
include/<somecode>.hh
src/<somecode>.cc
Please, commit your changes or stash them before you can merge.
[/CODE]
Now, I don't want to commit my changes, because they would only cause
unnecessary conflicts for my other colleagues and most of these changes are
not relevant for anybody else.
I also don't want to create a different branch (which I understand is what
"git -stash" would do).
Right now, it seems the only thing I can do is un-doing my local changes,
which sort of goes against the idea of having a repository.
So: is there a way to merge the up-to-date "master code" unto my own local
code without having to commit my code first or having to make branches?
Cheers,
Machiel
--
Avís - Aviso - Legal Notice - (LOPD) - http://legal.ifae.es
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
