conflicted 1.1.0

conflicted 1.0.4

conflicted 1.0.3

conflicted 1.0.2

conflicted 1.0.1

conflicted 1.0.0

New functions

Improve conflict resolution

Minor improvements and bug fixes

Try the conflicted package in your browser

Any scripts or data that you put into this service are public.

conflicted documentation built on Nov. 27, 2021, 1:06 a.m.