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