Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Open
mythical-programmer opened this issue Apr 15, 2016 · 1 comment
Open

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

mythical-programmer opened this issue Apr 15, 2016 · 1 comment

Comments

@mythical-programmer
Copy link

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 !
@marcinolawski
Copy link
Owner

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@marcinolawski @mythical-programmer