Git Next
The Problem
Maintaining code quality in collaborative environments is challenging. Traditional Git workflows often lead to:
- Merge conflicts and “merge hell”
- Broken builds in the main branch
- Long-lived feature branches that drift from main
- Inconsistent commit quality and formatting
The Solution
Git Next is a powerful tool that enforces trunk-based development workflows in Git repositories. It ensures every commit passes CI checks before reaching your main branch, maintaining a consistently high-quality codebase without manual intervention.
“Trunk-based development is a source-control branching model where developers collaborate on code in a single branch called ‘trunk’, resist any pressure to create other long-lived development branches, and therefore avoid merge hell, do not break the build, and live happily ever after.” - trunkbaseddevelopment.com
How It Works
Git Next uses a three-branch system with automated promotion:
- Development happens on the
dev
branch - Developers work here, making commits that should pass CI - Git Next promotes commits to the
next
branch - One commit at a time is moved to thenext
branch for CI testing - Successful commits reach
main
- When CI passes, the commit is automatically promoted to themain
branch - Failed commits trigger notifications - Developers are alerted to fix issues in their commits
Key Features
- Automated Branch Management - Git Next handles all the branch updates and promotions
- CI Integration - Works with any CI system that can run checks on branch updates
- Notification System - Desktop, email, and webhook notifications when intervention is needed
- Multiple Forge Support - Works with GitHub and Forgejo (compatible with Gitea)
- Conventional Commit Enforcement - Ensures consistent commit message formatting
- Docker Support - Easy deployment in containerized environments
- TUI Overview - Terminal-based user interface for monitoring status
Getting Started
# Install from crates.io
# Initialize your repo
# Configure the server
# Start the server
Why Choose Git Next?
- Quality Assurance - Every commit in main is guaranteed to pass CI
- Simplified Workflow - No need for complex branching strategies
- Reduced Merge Conflicts - Frequent integration prevents code drift
- Automation - Less manual intervention means more time coding
- Flexibility - Works with your existing tools and CI pipelines
Learn More
License
Git Next is released under the MIT License.