Re: [Linux-zigbee-devel] wpan-next: git pull conflict

2014-08-06 Thread Alexander Aring
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 bran

[Linux-zigbee-devel] wpan-next: git pull conflict

2014-08-06 Thread Varka Bhadram
Hi, I am having clone wpan-next [1] on my workspace. I did *git pull* on master branch of tree. It ended up with following conflict.. *bhadram@cdac:wpan-next$ git pull* remote: Counting objects: 2295, done. remote: Compressing objects: 100% (2295/2295), done. remote: Total 2295 (delta 1711), reu