{"thread":{"id":"22495","subject":"update kernel with git","startedAt":"2010-02-02T20:47:37Z","lastAt":"2010-02-02T20:47:37Z","messageCount":1,"participants":["james_68"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"133388","messageId":"1265143657343-4503539.post@n2.nabble.com","threadId":"22495","inReplyTo":null,"subject":"update kernel with git","fromName":"james_68","fromEmail":"james.marxista@gmail.com","sentAt":"2010-02-02T20:47:37Z","receivedAt":"2010-02-02T20:47:37Z","isPatch":false,"sender":{"key":"james.marxista@gmail.com","avatar":null},"body":"\nHi, In my git repository I have a linux kernel 2.6.31 with a branch, I have\nto update master branch to 2.6.32.7. \nI tried git pull path_2.6.32 master but it doesn't run, it does some\ncomputation and then it says:\n......\nwalk df56cb1f37415f16a187738ee9e3c03e2106e305\nFrom http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.32.y\n * branch            master     -> FETCH_HEAD\nerror: Entry '.gitignore' not uptodate. Cannot merge.\nfatal: merging of trees 44927d86ace5c502486e26ed828a02fea9627119 and\n84637ae413afcb236f0e9060e03cdec9fa017b0b failed\n\nThe question is: Is it the correct way execute git pull .... to update my\n2.6.31 git kernel?\n\nThanks\nBye\n\n-- \nView this message in context: http://n2.nabble.com/update-kernel-with-git-tp4503539p4503539.html\nSent from the git mailing list archive at Nabble.com.\n"}]}