Test

Improve `test_merge_conflict` via new `prompt_yes_or_no` #452

Sign in to view logs

Run time

Learn about OS pricing on GitHub Actions

Job	Run time
Test coverage	3m 12s
Build and test (macos-latest)	2m 11s
Build and test (ubuntu-latest)	1m 51s
	7m 14s