Version Control

Git: The Source of Truth

Clean history, clear branching strategy, code review discipline. Git workflows that scale teams from 5 to 500 without chaos.

What we deliver with Git

01

Branching model that fits the team

Trunk-based with short-lived branches where release cadence allows, and a documented alternative where it does not. Chosen, not inherited.

02

Review policy that is enforced

Required reviews, status checks, and protected main branches configured in the platform so the policy does not depend on goodwill.

03

History hygiene

Commit conventions, meaningful messages, and squash rules that make the log an explainable record rather than an archaeology project.

04

Repository structure decisions

Monorepo or multi-repo chosen from build coupling and ownership, with the tooling that makes the choice survive growth.

05

Secrets and access control

Pre-commit and push scanning, scoped deploy keys, and credential rotation, so a leaked token is caught before it reaches a remote.

How we work with Git

Git problems are almost always process problems. If branches live for weeks, it is because releases are infrequent; if history is unreadable, it is because review expectations are unclear. We fix the flow, then configure the tooling to enforce it.

Access and secrets get checked early. Every repository we review has a story about a token committed years ago, and the cheap time to deal with it is before the next audit.

Git in production: where it breaks

The same handful of problems show up on almost every engagement. Naming them early is cheaper than discovering them at 2am.

Long-lived feature branches

Merges become negotiations and integration bugs pile up. Short-lived branches behind flags keep integration continuous.

Force-push on shared branches

Someone loses work and trust in the process. Protected branches and pull-request-only updates end the practice.

Secrets committed and never rotated

Removing the file does not invalidate the credential. We rotate, add scanning to the pipeline, and record what was exposed.

When to use Git

Teams growing past the point where informal branching still works.

Organisations needing an auditable change trail for compliance.

Repository consolidations after acquisitions or team reorganisations.

Our strengths with Git

Trunk-based development, branch policies
Code review workflow and status checks
Monorepo tooling, submodules, ownership
Secret scanning, signed commits, access control

Straitworks Concierge

👋 Here to help you navigate

Good afternoon! 👋 What can I help you find?

What brings you here today?

Choose what you'd like to explore