git-workflow

GitHub Flow suits continuous deployment and small-to-medium teams, trunk-based development fits experienced teams with feature flags deploying multiple times daily, and GitFlow works for scheduled releases in enterprise or regulated environments with larger teams.

Use the format type(scope): subject, where type is feat, fix, docs, refactor, test, chore, perf, ci, or revert. Keep the subject in imperative mood under 50 characters, and use the body to explain why the change was made.

Use rebase to update a local-only feature branch with the latest main for a clean linear history. Never rebase branches that have been pushed and shared, that others based work on, or protected branches like main, since rebase rewrites history.

Run git status to see conflicted files, then edit the conflict markers manually, use git mergetool, or accept one side with git checkout --ours or --theirs. After resolving, stage the files with git add and commit the result.

Use git revert HEAD to create a new commit that undoes the changes, then push normally. Avoid git reset --hard or force-pushing on shared branches, since rewriting public history breaks other contributors' work.