From: bruno randolf <bruno@thinktube.com>
To: linux-wireless <linux-wireless@vger.kernel.org>
Subject: merge errors on 'everything'
Date: Wed, 9 Jan 2008 10:43:01 +0900 [thread overview]
Message-ID: <200801091043.02204.bruno@thinktube.com> (raw)
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?
bruno
next reply other threads:[~2008-01-09 1:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-09 1:43 bruno randolf [this message]
2008-01-09 1:51 ` merge errors on 'everything' John W. Linville
2008-01-09 2:32 ` Pavel Roskin
2008-01-09 9:05 ` Kalle Valo
2008-01-10 1:29 ` bruno randolf
2008-01-10 9:43 ` Andreas Schwab
2008-01-10 10:00 ` Kalle Valo
2008-01-10 15:34 ` John W. Linville
2008-01-19 9:28 ` bruno randolf
2008-01-13 13:10 ` David Woodhouse
2008-01-15 10:11 ` Kalle Valo
2008-01-09 2:13 ` Pavel Roskin
2008-01-09 9:44 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200801091043.02204.bruno@thinktube.com \
--to=bruno@thinktube.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.