-
Notifications
You must be signed in to change notification settings - Fork 0
Home
- master: tracks to Spacemacs master, with compatible preference updates
- develop: tracks to Spacemacs develop branch, with bleeding-edge changes.
Whenever a new release of Spacemacs is announced (and I notice it), I intend to merge from develop back into master, and then tag my master branch with the same version as Spacemacs.
Ideally I would like to use the master branch for my day-to-day Spacemacs, it should be the most stable. If there is some new feature that will work with master, then merge/copy that change in using (from the master branch):
git checkout develop some/file/path
and then commit the change to master. IMPORTANT: don't merge the develop branch to master, unless master is being updated for a new Spacemacs release. Otherwise other, breaking changes in develop will be merged as well. Just copy individual files like above.
Practically though, sometimes this can't happen, because Spacemacs has gone for more than a year now with work taking place on its develop branch, progressing from 0.200.x to 0.300.x, but without an update in master except for bug fixes.
My tags match the Spacemacs releases, but with the version number only. I'm not "releasing" my spacemacs configuration, just making it public.
I also don't tag my repo with every "release" tag from Spacemacs, only where I've updated codes to match a particular release. I'm tracking to Spacemacs, but I'm not being pedantic about each release!