Making Sense of git-flow

Vincent’s Git workflow is powerful and simple. So it is the best one for most of us. When you tell somebody that you aren’t using it then they expect a pretty convincing explanation why not. There isn’t much to make sense of really.

gitflow-avh is the easiest way to use it. I tried doing it manually but it is easier to use the plugin. Here are some of the differences if you want compare the plugin with doing it manually. It is worth trying out manually if you want to appreciate the plugin, maybe.

This and this cheat-sheet aren’t all you need to know but they are a fine start.

A Simplified Git Workflow

This is what I use most of the time when I don’t need 4096 feature branches.

Cool thing is that even when you do need 4096 feature branches that this still makes total sense. Add some client releases and QA branches and it still works fine.

Key though is that it is really is this simple.

Three Nice Looking Diff Tools and My Pick

1 Desire

Diff’s are hard. 80% of the time they are simple and fast. 20% of the time they are, well, complicated! My days of text-only diffs are coming to an end. They remain a part of my toolbox but I want a grown-up GUI diff tool. Fortunately there are plenty of options. But how to choose?

  • My decision making process was pretty simple: write down questions about them and answer them in a big spreadsheet
  • See where that takes me
  • Make a decision

Here is how it went.

Continue reading “Three Nice Looking Diff Tools and My Pick”