v4.37 Branch Rename - TACC/Core-CMS GitHub Wiki

v4.37: Core-CMS default branch is again named main and adheres to semver.*

• I renamed main to release/v4.36.X.
• I renamed stable to to main.

To ensure your local development is up-to-date:

0. No need to run GitHub's suggested commands.
   If you already had, no problem.

1. If you've any unique local commits† on main or stable to preserve…
   Move them to their own branch.

2. If/Once your main branch has no unique local commits†, run —

   git fetch origin
   git checkout -B main origin/main
   git branch -D stable 2>/dev/null || true

   — to replace your main with that of remote, and delete your stable branch.

Feel free to contact a Core-CMS developer if you have any trouble.

^{* Default branch had been named stable since v4.35.something, because main branch held new feature that had a bug unacceptable for most clients. That feature was stuck in never-ending v4.36.patch releases, while even newer features, built in stable, were stuck in v4.35.patch releases. To resolve my mistake, I renamed main to release/v4.36.X, and renamed stabletomain`. A complex change, but this repo has had few developers during this transition.}

^{† By unique local commits, I mean you commits that you have on your local main or local stable branch, which are not on their respective remote branch.}