Changes in branches management #1657
JF002
announced in
Announcements
Replies: 0 comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
-
The @InfiniTimeOrg/core-developers noticed that the branch management is not optimal right now. InfiniTime is currently based on 2 'main' branches :
masteranddevelop. We create new branches fromdevelopand merge develop inmasterto release a new official version of InfiniTime.This workflow gives us the opportunity to release hotfixes from
masterwhile still working on other changes indevelop.However, this workflow based on 2 branches brings a bit of complexity (especially when releasing a new version of InfiniTime) which we don't need. That's why we decided to switch to a single "main" branch model.
To make the change more explicit, we decided that the new "main" branch will be called
main(instead ofdevelopandmaster). All PR will have to be merged inmainand releases will be tagged directly onmainas well. We'll still have the opportunity to createsupportbranch in case we need to patch previous release.What does it change for you developers and contributor? Since we are renaming
developtomain, Github will automatically redirect all links pointing to the old develop to the new main. However, you'll probably need to update your working copy as explained here : https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/renaming-a-branch#updating-a-local-clone-after-a-branch-name-changes.Github should also notify you about this change like below :

Beta Was this translation helpful? Give feedback.
All reactions