Hello all,
I am currently working on some code at the office that I also want to
work with at home. Seems like a good candidate for git. So I created a
repository at work and did a "git clone" at home. I've run into some
strange behaviour that I don't understand and would appreciate if
someone can clarify for me.
Imagine this scenario. At work:
git init
edit test.c
git add test.c
git commit
Then at home:
git clone <work git url>
edit test.c
git commit -a
git push
At this point, I wanted to push my changes back to my work repository
so I can continue work the next day. So at home, I did a git push. I
expect that my work repository has the newest material, but I find
that when I do "git status" at work the next day, it tells me that my
test.c is "modified" and has already staged it for commit. I need to
do a "git reset" followed by "git checkout" to update my work folder
to the latest stuff.
Totally different from my expectation of the repository knowing that
it is out of date and then kindly suggesting that I should do a "git
update" of some sort. What piece of understanding am I missing to
properly "get" what is going on here, and how am I supposed to
properly work with this setup?
Thanks for any help.
Gerald.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html