Software Practice

Version Control

Tracking changes, branching and collaborating on shared files.

Branching Strategies for Small Teams

Compare common ways to organise Git branches, from a single shared branch to feature branches and release branches, and pick one that suits a small team.

4 min read

Git Basics: Commits, Branches and Merges

A step-by-step walk through the everyday Git workflow: staging changes, committing, creating a branch and merging it back, with the commands explained.

4 min read

How to Write Useful Commit Messages

Habits for short, descriptive commit messages: a clear summary line, a body that explains why, and consistent conventions that keep project history readable.

4 min read

Resolving Merge Conflicts Calmly

Why Git merge conflicts happen, how to read conflict markers, and a careful step-by-step routine for resolving them without losing anyone's work.

4 min read

Tagging Releases and Keeping a Changelog

How to mark released versions with Git tags and keep a changelog that tells users and teammates what changed between releases, with simple examples.

4 min read

Undoing Mistakes in Git Safely

How to discard edits, recover a deleted file, revert a bad commit and rewrite local history in Git, with guidance on what is safe once work is shared.

4 min read

Related topics

More in software practice