* add conflict detection * test pull request conflict files * fix detection files number * fix comments
9.0 KiB
9.0 KiB
* add conflict detection * test pull request conflict files * fix detection files number * fix comments