On 2008-11-25, Endre Bakka <[EMAIL PROTECTED]> wrote: >> 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,
Evidently. I swear I followed the instructions on the Wiki, but when I tried to do a pull, I got one failure after another complaining about overwriting uncontrolled working files. It complained about almost every file in the tree (except those under arch/nios). In order to get the pull to complete, I had to delete most of the source tree. Then the pull worked, and when I ran it again, it said "already up-to-date". Except that much of the source tree was still missing. A "git checkout" fixed that. > 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. And I made the mistake of following the instructions on the Wiki without understanding what was going on. -- Grant _______________________________________________ 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
