All Posts In Git

When working in a Git-based development team, especially in real-world projects, understanding how to manage branches and history is essential. This post explains the practical use of merge, rebase, and squash, as well as how to use demo or staging branches for safer and more flexible workflows.

When working with Git, merging branches is a fundamental part of collaboration. But not all merges are the same. There are three main merge strategies you can use, and each one impacts your repository history differently.

I recently discovered a powerful use case for git stash that completely changed how I handle mid-work context switching. While working on a large feature branch with over 20 modified and untracked files, I needed to switch to master to make a quick fix—without committing or losing my visual diffs. Using git stash push -u -m "message", I was able to safely stash everything, including untracked files, switch branches, make the fix, and then restore my exact working state with git stash pop. This simple Git trick preserved my flow, saved time, and is now part of my go-to workflow.