Use prompt asking user to resolve a conflict. Use --non-interactive to disable interactive mode.
Merge pull request #6 from scf2k/interactive

Use prompt asking user to resolve a conflict. Use --non-interactive to disable interactive mode.