On Wed, Jan 09, 2008 at 10:43:01AM +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 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? You'll need to get a fresh clone of the repository -- sorry. -- John W. Linville linville@xxxxxxxxxxxxx - 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
