From: Alexander Aring <alex.aring@gmail.com>
To: Varka Bhadram <varkabhadram@gmail.com>
Cc: linux-zigbee-devel <linux-zigbee-devel@lists.sourceforge.net>,
linux-wpan@vger.kernel.org
Subject: Re: wpan-next: git pull conflict
Date: Thu, 7 Aug 2014 08:34:05 +0200 [thread overview]
Message-ID: <20140807063400.GA17337@omega> (raw)
In-Reply-To: <53E2F959.6020904@gmail.com>
Hi Varka,
yea I notice about that I did a force update and the github repos base
on bluetooth-next and bluetooth now.
You need to rebase your work on these repositories, sorry.
Do you have patches on top of the old repo? If not, then simple do also
a force "git reset ...".
If yes, create a branch and do git cherry-pick from the necessary
commits.
Sorry. :-(
Do you also know the new mailinglist?
http://vger.kernel.org/vger-lists.html#linux-wpan
I didn't send it to the zigbee one.
- Alex
parent reply other threads:[~2014-08-07 6:34 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <53E2F959.6020904@gmail.com>]
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=20140807063400.GA17337@omega \
--to=alex.aring@gmail.com \
--cc=linux-wpan@vger.kernel.org \
--cc=linux-zigbee-devel@lists.sourceforge.net \
--cc=varkabhadram@gmail.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