Practicalweb Ltd

Technical information on this site may be out of date : no updates since 2015

Git Integration branch based workflow

February 16, 2015 , posted under git Version Control

The branching strategy I’ve found most effective and flexible is to use one branch per release version that is used for integration and feature branches off these for everything else.

It’s hard to visualise and I’ve tried drawing graphs but once I build in enough features to make the graph meaningful it is no longer easy to interpret.

Read More…

Blocking git commits from future merges

August 15, 2013 , posted under svn git version control

I used to use subversion and svnmerge a lot, and there’s just one thing I miss about it. Now svnmerge is a tool to bolt on merge tracking to svn, and gits merge tracking is vastly better in many ways. But the one thing that svnmerge allowed me to do that was cool and doesn’t have a real equivalent in git is to block commits

Read More…