On Wed, 2008-01-09 at 10:43 +0900, bruno randolf wrote: > hi! > > many times when i do a 'git pull' to update the wireless-2.6 'everything' > branch i run into unexplicable merge errors. I think the explanation is that the changes in the branch are rebased, rather than merged, when the wireless-2.6 repository is updated from the upstream Linux repository. git views changes on top of the old tree in your repository as independent from those that appear in wireless-2.6, so it tries to merge them. But since it's actually the same patches, git sees that as a conflict. You can clean up the consequences of the failed merge by running "git-reset --hard origin/everything" where "origin" is the name of the remote. > i created the branch with 'git co --track -b everything origin/everything' and > i don't work on this branch so all files are un-modified. > > what am i doing wrong? I'm not sure you are doing anything wrong. It's quite possible that git should be changed to handle this problem better. Or maybe the wireless-2.6 repository should be managed differently. -- Regards, Pavel Roskin - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
