Skip to contentSkip to conversation

wpan-next: git pull conflict

DISCUSSION Alexander Aring 1 participant 1 message Aug 7, 2014 1 message not in the archive IEEE 802.15.4

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Alexander Aring

author maintainer
#1 lore raw

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