I've backed up the current version of develop to a branch called develop-extended-backup-20240424-DO-NOT-REMOVE.
Then I have merged master into develop.
The current master branch is exactly the same as release-0.6.5, i.e., release 0.6.5 of libqasm.
As of agreed this afternoon, the idea, from now on, is to start working on feature branches from develop. Then, when we decide to create a release, we create a release branch from develop, we merge it to master, and we tag master.
I've backed up the current version of
developto a branch calleddevelop-extended-backup-20240424-DO-NOT-REMOVE.Then I have merged
masterintodevelop.The current
masterbranch is exactly the same asrelease-0.6.5, i.e., release 0.6.5 of libqasm.As of agreed this afternoon, the idea, from now on, is to start working on feature branches from
develop. Then, when we decide to create a release, we create a release branch fromdevelop, we merge it tomaster, and we tagmaster.