search

django-oscar / django-oscar-api

RESTful JSON API for django-oscar
Other
363 stars 160 forks source link

master ahead of main? #332

Closed JulienPalard closed 5 months ago

JulienPalard commented 5 months ago

I'm surprised to see a master branch and a main branch:

* 20ba73b (origin/master) Make sure to only return attributevalues that are on the actual product to avoid transferring (#331) 2024-01-24 14:55:09 +0100 Voxin Muyli
* 6b6713b Enable shortcut when saving child products. (#322) 2024-01-24 14:34:19 +0100 Voxin Muyli
* 13ce8f4 Renamed warning 2024-01-24 14:34:19 +0100 Lars van de Kerkhof
* 44abf30 Optimize attribute values (#321) 2024-01-24 14:34:19 +0100 Voxin Muyli
* f24ef46 (origin/main, origin/HEAD) Merge pull request #325 from JulienPalard/mdk-doc 2024-01-24 14:29:29 +0100 Voxin Muyli

Also the README on the main branch shows "shields" of the master branch.

is this expected?

specialunderwear commented 5 months ago

Yes, master has code that depends on oscar 3.2.3 so we have have to wait with merging until the final version has been released.