From: Pavel Roskin <proski@gnu.org>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: bruno randolf <bruno@thinktube.com>,
linux-wireless <linux-wireless@vger.kernel.org>
Subject: Re: merge errors on 'everything'
Date: Tue, 08 Jan 2008 21:32:48 -0500 [thread overview]
Message-ID: <1199845968.3697.22.camel@dv> (raw)
In-Reply-To: <20080109015102.GB3048@tuxdriver.com>
On Tue, 2008-01-08 at 20:51 -0500, John W. Linville wrote:
> 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.
While it's reassuring to see that I'm not missing some elegant solution,
I think cloning the repository is a major overkill.
"git-reset --hard origin/everything" does the trick for me, while using
much less bandwidth and time. It even works with StGIT because it
unapplies the patches before pulling and doesn't apply them in case of
conflicts. I can apply the StGIT patches after "git-reset".
--
Regards,
Pavel Roskin
next prev parent reply other threads:[~2008-01-09 2:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-09 1:43 merge errors on 'everything' bruno randolf
2008-01-09 1:51 ` John W. Linville
2008-01-09 2:32 ` Pavel Roskin [this message]
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=1199845968.3697.22.camel@dv \
--to=proski@gnu.org \
--cc=bruno@thinktube.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).