Closed lucasjans closed 9 years ago
Hi Lucas. This looks great, thanks for the pull request!
Would you mind making two changes as part of this PR? (a) update RELEASE-NOTES.md adding a line about this change with a link to the PR, and (b) add unit tests for the conflict option. With those changes, this would be good-to-merge. :smiley:
@mfenniak thanks for the suggestion. Done! Hope the tests meet your guidelines, if not let me know.
One more thing - I did make a comment about a version change in the readme - but not sure if that's right either - or where to update it to reflect that.
Thanks Lucas! I did modify the release notes slightly, but I appreciate that you made the change for me. :-) The tests look good.
@Modify