The 1 branch is where most improvements happen, and slightly ahead of master. master has a branch-alias of 1.3.x-dev, which is lagging far behind the actual tags (up to 1.5.1). I've seen some really weird constraint failures in composer because of this (sorry, don't have the exact message or circumstances).
We could set this branch alias to 2.x-dev, but I would argue that there's no reason for this until we actually want to make breaking changes. Instead, my recommendation would be to merge 1 into master, delete the 1 branch, and change the branch-alias in master to 1.x-dev.
The
1
branch is where most improvements happen, and slightly ahead of master.master
has a branch-alias of1.3.x-dev
, which is lagging far behind the actual tags (up to1.5.1
). I've seen some really weird constraint failures in composer because of this (sorry, don't have the exact message or circumstances).We could set this branch alias to
2.x-dev
, but I would argue that there's no reason for this until we actually want to make breaking changes. Instead, my recommendation would be to merge1
intomaster
, delete the1
branch, and change the branch-alias inmaster
to1.x-dev
.