'git resolve'
From: Thomas Glanzmann <hidden>
Date: 2016-06-15 22:41:57
Hello, has someone out there an git-resolve script? Which guides the user tot he process of stuff that is not handeled the autmatic merge or the threeway merge? Thomas