New Right Side Git Checklist
I created a new branch that is called right-side-main.
The purpose of this branch is to basically redo the app without deleting the original main.
This means that until I merge this right-side-main with the primary main, all branches need to be created off this branch and merged into this branch.
This checklist will serve as I my process during this so I don’t merge into primary main.
Procedure To Create Merge feature-branch Into right-side-main main With Tagging and Delete
Switch to right-side-main
git checkout right-side-main
Merge right-feature-branch to right-side-main
git merge --no-ff right-feature-branch
Do a merge tag
git tag -a dev-<date>-<time> -m "Merge of right side feature branch"
Push tag to remote
git push origin --tags
Push right-side-main to origin
git push origin right-side-main
Delete right-feature-branch on local
git branch -d right-feature-branch
Delete feature-branch on remote
git push origin --delete right-feature-branch
Create new right-feature-branch-2 off of right-side-main
git status (to make sure you're on right-side-main)
git checkout -b right-feature-branch-2
Do a first empty commit
git commit --allow-empty -m "Initial empty commit on right-feature-branch-2"
Push empty commit to origin with -u flag to set up tracking
git push -u origin right-feature-branch-2
Done
The real question is how quickly will I screw this up. Any bets. The over/under is probably 2 merges.