ci

Move the conflicts resolution logic inside the checkForConflicts cond… #112

Sign in to view logs

Run time

Learn about OS pricing on GitHub Actions

Job	Run time
lint	35s
test (12, ubuntu-latest)	23s
test (12, windows-latest)	9s
test (12, macOS-latest)	6s
	1m 13s