·
169 commits
to master
since this release
Adds ability to ignore merge conflicts instead of erroring out (#17 - thanks @adrian-gomez!).
Adds ability to ignore merge conflicts instead of erroring out (#17 - thanks @adrian-gomez!).