I was still thinking in "svn" mode. The "git pull" only
updates the database, not the working copy -- right? In order
No. git pull does two things:
- git fetch which updates the database (so now you have remote changes on
your harddrive)
- git merge, which merges the changes with your local branch in the
database AND working copy.
So yes, git pull will update both the database and working copy. You can
have uncommited local changes in your working copy, but the merge can fail
then (e.g. if you have changed a file that has also changed remotely), so
it is recommended to commit your own changes before pulling (then the
changes will be merged).
to get the pull to work, I had to delete large portions of the
working copy tree to avoid errors about "overwriting
non-controlled working file" or something like that.
After I got the pull to work, I needed to do a checkout to
replace the files I had deleted.
Ok, sounds like you've done some strange things here, but you might be
good. I would recommend that you read a few git tutorials and create a
couple of test repositories that you play with (create one, clone it and
try edit/commit/pull/fetch/merge/branch operations). Make sure you
understand remote and local branches, and how the merge process works. git
is powerful, but has a steep learning curve and take some getting used to.
- Endre
_______________________________________________
uClinux-dev mailing list
[email protected]
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by [email protected]
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
