Gernot Pokorny Sat, 17 Jun 2017 09:31:17 -0700
https://stackoverflow.com/questions/44606858/git-merge-workflow-save-changes