AnssiR66 / AlanStdLib

The Standard Library for ALAN Interactive Fiction Language
Other
5 stars 2 forks source link

Dev Switches to Branch 'dev-2.2.0': Merging All Others #89

Closed tajmone closed 2 years ago

tajmone commented 3 years ago

@AnssiR66, I've merged the dev-2.2.0-docs branch into dev-2.2.0 so from now on we'll work only on dev-2.2.0.

We've reached a point in which having separate branches is no longer needed, but it's becoming a burden. By keeping the remaining work on the single dev-2.2.0 branch it's going to be easier to work on both the Lib code and the Manual at once, without having to switch.

So, for now all development will occur only on dev-2.2.0, unless future needs demand working with other branches.

I didn't squash the branches, just merged them (with a merge commit, message and all) so we can keep a linear history of the work done so far.

Ultimately, when the v2.2.0 release is ready we'll just squash everything into a single commit in master to avoid confusion in the main branch.

tajmone commented 2 years ago

Deleting Squashed Branches

@AnssiR66, I'm deleting from the repository these old dev branches which have already been squashed into dev-2.2.0, but keeping a copy on my own fork (click links to view):

Since these have all been squashed, keeping them here is only going to clutter the repository. In case we ever need to look into them, we have their copies on my fork, so they are not lost (also, if you've checked them out locally you might also local copies of them).

Once StdLib v2.2.0 will be released, we won't be working any more with long standing dev branches that get eventually get squashed but remain in the repository, since these were mostly needed for the big leap from the old system to the newer one (AsciiDoc, new toolchain, etc.) which was a huge change. In the future we should be able to keep a simpler and more linear Git workflow.