linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: bruno randolf <bruno@thinktube.com>
To: Kalle Valo <kalle.valo@nokia.com>
Cc: Pavel Roskin <proski@gnu.org>,
	"John W. Linville" <linville@tuxdriver.com>,
	linux-wireless <linux-wireless@vger.kernel.org>
Subject: Re: merge errors on 'everything'
Date: Thu, 10 Jan 2008 10:29:44 +0900	[thread overview]
Message-ID: <200801101029.44985.bruno@thinktube.com> (raw)
In-Reply-To: <87myrf74ix.fsf@nokia.com>

On Wednesday 09 January 2008 18:05:26 Kalle Valo wrote:
> Pavel Roskin <proski@gnu.org> writes:
> >> 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.
>
> I agree.
>
> > "git-reset --hard origin/everything" does the trick for me, while using
> > much less bandwidth and time.
>
> I do the same and it has worked for me, at least.

thanks for that hint, but still, that sucks if you want to rebase your local 
work against an updated 'everything'...

how do you guys manage your pending patches and local work then?

thanks,
bruno

  reply	other threads:[~2008-01-10  1:29 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
2008-01-09  9:05     ` Kalle Valo
2008-01-10  1:29       ` bruno randolf [this message]
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=200801101029.44985.bruno@thinktube.com \
    --to=bruno@thinktube.com \
    --cc=kalle.valo@nokia.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=proski@gnu.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 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).