git-workflow

Git branching workflows like Git Flow and GitHub Flow provide structured patterns for creating, managing, and merging branches. Git Flow uses feature, release, and hotfix branches; GitHub Flow keeps a single main branch with short-lived feature branches. Both enforce safety through pull request reviews before merging to production.

Conventional commit messages follow the format type(scope): description, where type is feat, fix, docs, etc. This standard makes commit history readable, enables automated changelog generation, and clarifies what changed and why. Atomic commits—one logical change per commit—further improve clarity.

Merge conflicts occur when changes overlap across branches. Resolve them by examining both versions, choosing or combining the correct code, then staging and committing the resolution. Always test after resolving; using --dry-run flags before complex merges helps identify conflicts early.

Interactive rebase lets you reorder, squash, or edit commits before pushing. Create a backup branch first, then use git rebase -i to restructure history safely. Never rebase commits already pushed to shared branches, as it rewrites history others depend on.

Delete merged branches locally with git branch -d and remotely with git push origin --delete to keep the repository clean. Use --dry-run first to preview deletions. Regular cleanup prevents branch clutter and makes repository navigation easier for collaborators.

Fetch upstream commits with git fetch, then rebase or merge them into your branch. Rebasing keeps history linear; merging preserves the full history of parallel work. Always ensure your working directory is clean before syncing to avoid conflicts.