Introduce new dev branch about skeleton HOT 5 CLOSED

I know these are arbitrary names and opinionated, but my 2 cents (Dollarydoos !).

master never made sense. We literally use the branch command all the time and branches come off a trunk
We develop in our feature branches, but then attempt to merge multiple features into the staging area.

So my vote is for trunk and staging with all feature branches to originate from staging and staging being the only one that merges to trunk to be tagged as a release.

from skeleton.

Ha, <3 Dollarydoos.

Sounds like you've used Subversion in the past?
http://guides.beanstalkapp.com/version-control/branching-best-practices.html

I may be revealing some ignorance on my part, but this is the first I've heard of this paradigm! Makes the UX part of my brain start throwing some red flags on whether casual contributors these days will understand this.

As with many things in Skeleton my inspiration here is Mantine:
https://mantine.dev/pages/contributing/#git-branches
https://github.com/mantinedev/mantine/branches

Also I'm lazy, so typing dev is shorter :)

from skeleton.

Heh, try CVS and then svn shudder

Nah, mainly from Github/Gitlab Flow paradigms:
https://www.gitkraken.com/learn/git/best-practices/git-branch-strategy
https://www.flagship.io/git-branching-strategies/

I do like having that safety net of merging back into staging before some CI/CD shoots it straight out to S3/GitHub Pages. Our current situation right now seems like a good example - we have docs with A11y content updates, but also a mass rename of all docs pages due to SK.next.409 and the actual Skeleton lib updates that affect the doc functionality in two separate feature branches, but if we were to merge them to trunk before we release the actual package to npm, that wouldn't be cool. And considering that the testing covers looking at the same pages, it would be a waste of time to do it once for each feature branch to verify when it could be all merged to staging for a final single look over before releasing it in tandem with the npm package.

But then again, we don't have CI/CD yet, so keeping it as simple as possible is fine by me too!

from skeleton.

That's interesting. Yeah I think as we continue to grow things will evolve more and change. Given the limited staff and resources we're probably best to go with the simplest option. So we'll use the dev branch as mentioned in the OP. But I would like to read more into this going forward. Thanks for sharing Nik!

from skeleton.

The branch is live and includes various updates to the documentation. This includes details for targeting the dev branch for all PRs going forward. I'll echo this info on the Discord as well.

from skeleton.