* Re: wpan-next: git pull conflict
[not found] <53E2F959.6020904@gmail.com>
@ 2014-08-07 6:34 ` Alexander Aring
0 siblings, 0 replies; only message in thread
From: Alexander Aring @ 2014-08-07 6:34 UTC (permalink / raw)
To: Varka Bhadram; +Cc: linux-zigbee-devel, linux-wpan
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-08-07 6:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <53E2F959.6020904@gmail.com>
2014-08-07 6:34 ` wpan-next: git pull conflict Alexander Aring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox