Using feature-based branching strategy will help you avoid git hell, this blog post compares it to release branches
Read more >>