git-workflow-helper

Handle common git scenarios, conflicts, and hook failures