Git Workflow Explained

Full transcript

Every project starts on the main branch. A developer creates a new feature branch, giving themselves a safe, isolated space to build something new without touching the stable codebase. The developer makes several small commits on the feature branch, then squashes them all into one clean, meaningful commit before opening a pull request back into main. Meanwhile, other developers have pushed new commits directly to main. Our developer must rebase their feature branch on top of the latest main to keep everything up to date and avoid conflicts. After rebasing, the developer opens a fresh pull request. The feature is reviewed, approved, and cleanly merged into main, keeping the project history linear and easy to follow. When it is time to ship, a release branch is cut from main. This branch captures a stable snapshot, allowing the team to prepare, test, and finalize the version without interrupting ongoing development. If a critical bug is found in production, a hotfix branch is created from main, the fix is committed, merged back into main, and then immediately rebased or merged into the release branch to keep both lines safe and stable.