Test

Improve `test_merge_conflict` via new `prompt_yes_or_no` #451

Sign in to view logs

Run time

Learn about OS pricing on GitHub Actions

Job	Run time
Build and test (ubuntu-latest)	1m 27s
Build and test (macos-latest)	2m 44s
Test coverage	3m 9s
	7m 20s