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