Fading Coder

One Final Commit for the Last Sprint

Home > Notes > Content

Executing a Git Release Workflow: Branching, Merging, and Tagging

Notes 1

Preparing the Local Environment and Synchronizing State

Verify the working tree is clean before initiating a release workflow:

git status --short

Return to the primary development line and fetch upstream changes to avoid divergnece:

git switch main
git fetch origin
git rebase origin/main

Brnaching and Development Phase

Establish an isolated track for the upcoming release candidate:

git checkout -b release/v0.9.1

Apply modifications, stage artifacts, and record the snapshot:

git add .
git commit -m "Feat: implement v0.9.1 target updates"

Synchronize the feature track with the remote repository:

git push -u origin release/v0.9.1

Integration and Merging

After validation confirms stability, integrate the release track into the baseline:

git switch main
git merge --no-ff release/v0.9.1 -m "Merge branch 'release/v0.9.1' into main"
git push origin main

Using --no-ff preserves the complete history of the release integration event.

Version Pinning

Attach an immutable annotation to the merged commit to mark the official build:

git tag -a v0.9.1 -m "Release version 0.9.1"
git push origin v0.9.1

The annotated tag captures metadata, authorship, and signing information when applicable.

Post-Release Cleanup

Remove temporary tracks to maintain repository hygiene:

git branch -d release/v0.9.1
git push origin --delete release/v0.9.1

Switch back to the main line to resume standard operations:

git switch main

Related Articles

Designing Alertmanager Templates for Prometheus Notifications

How to craft Alertmanager templates to format alert messages, improving clarity and presentation. Alertmanager uses Go’s text/template engine with additional helper functions. Alerting rules referenc...

Deploying a Maven Web Application to Tomcat 9 Using the Tomcat Manager

Tomcat 9 does not provide a dedicated Maven plugin. The Tomcat Manager interface, however, is backward-compatible, so the Tomcat 7 Maven Plugin can be used to deploy to Tomcat 9. This guide shows two...

Skipping Errors in MySQL Asynchronous Replication

When a replica halts because the SQL thread encounters an error, you can resume replication by skipping the problematic event(s). Two common approaches are available. Methods to Skip Errors 1) Skip a...

Leave a Comment

Anonymous

◎Feel free to join the discussion and share your thoughts.