Why is there a branch creator and a branch 3.0-mikro-e

[jordanpenard]

Hi,
I was wondering what is the difference between the branches creatorand 3.0-mikro-e ?
Because 3.0-mikro-e is the one used by IoT Project 1 for example, but I can see that the latest merged pull request has been merged into creator.
What's the plan to get this right, in the future always merging into 3.0-mikro-e or changing the manifest of CreatorKit to checkout the creator branch of contiki ?

Cheers

[abhijit-mahajani-imgtec]

Thanks @jordanpenard for pointing this out,
the difference between the two branches:
https://github.com/CreatorDev/contiki/compare/3.0-mikro-e...creator?expand=1

3.0-mikro-e has been based upon https://github.com/contiki-os/contiki/tree/release-3-0. However to upstream the mikro-e support to contiki, we will need to base our changes on "https://github.com/contiki-os/contiki/tree/master". that's on our roadmap.

creator branch will be superset of the current 3.0-mikro-e since it will contain avrdude, pickle related extra support. Eventually "creator" will be our working branch. and the other one we want to keep it for upstreaming to contiki. Once all the pull requests are merged, we will update the documentation.
Hope this clarifies the purpose.

Thanks.