Git

One of the tools I find more useful on git, and which I love the most is git-rebase(1). It works around the premise that originally bought git to control version systems: that you can and should rework your repository history, to make it more organized and readable.

Around the world, each project stablish its one convention of how to work with git, some of them use techniques like git-flow, others, just a branch and tags, others divide between master/main and a production/release branch. The company I work for convention is to always create a specific branch to work on a new feature, bug fix or whatever. Having done that, I adopt the discipline to (1) keep it up to date with the parent branch using git pull --rebase origin/parent_branch and (2) as I work on it, I try to keep it tidy using git rebase -i HEAD~N.