Closed pszulczewski closed 11 months ago
@jvanderaa just to confirm, next-2.0
goes to main
?
This branch was checked out from next-2.0
That's a good question. Are we going to maintain a "main" for 1.x bug fixes to follow with Nautobot 1.6 LTM?
From App & SDK Branching Strategy
:
* ltm-1.6 is created from main - bugfix branch for LTM compatible releases
* next-2.0 is frozen and merged into develop
* develop now tracks Nautobot 2.x
* releases are created from develop and merged into main as usual. main now tracks Nautobot 2.x
* next-3.0 eventually tracks Nautobot 3.0 (pre-release)
ltm-1.6
has been checked out from main
, nautobot "stable"
changed to "1.6"
, python 3.7 removed. origin/develop
merged into ltm0-1.6
as we didn't have all commits in main.
We should be good now.
Updates for release 2.0.
develop
has been merged intonext-2.0