Git collaboration

Git collaboration is the operating model around shared history: pull requests, review, conflicts, branch strategy, and merge policy. The goal is integrating small, verified changes without losing context or blocking delivery.

Subtopics: pull requests, code review, conflict resolution, feature branches, trunk-based development, GitFlow basics.

On interviews: PR sizing, required checks, resolving conflicts, choosing feature branches versus trunk-based development, adapting workflow to release cadence.

Common pitfalls: workflow as empty ceremony; skipping review or CI; long-lived branches that defer integration pain.

The trade-off is branch isolation versus frequent integration — align with flags, tests, and deployment controls.

Checklist:

• Keep changes reviewable.
• Use CI and branch protection as gates.
• Choose a branching model that matches release needs.
• Resolve conflicts with semantic verification.