StoryboardMerge icon indicating copy to clipboard operation
StoryboardMerge copied to clipboard

Published 20 hours ago • verified publisher icon marcinolawski

git mergetool -t storyboard asks for left and right hand side files to be selected

Open mythical-programmer opened this issue 9 years ago • 1 comments
trafficstars

After setting up everything, storyboard-merge is opening, but asks for the left and the right hand side file explicitly. This is not the correct behavior. It should be automatically be taking up the left and right hand side versions based on the merge conflicts, right !

mythical-programmer avatar Apr 15 '16 10:04 mythical-programmer

Unfortunately I don't actively maintain this project anymore. If you found a bug, you are more than welcome to fix it.

marcinolawski avatar Apr 18 '16 10:04 marcinolawski