2 Commits

Author	SHA1	Message	Date
Andrew Eisenberg	e524cd64db	Update branch names for check-for-conflicts.yml job	2022-06-22 16:07:46 -07:00
Henry Mercer	5b5ed44ab7	Add a PR check to check for conflict markers ... This check is primarily intended to validate that any merge conflicts in the v2 -> v1 backport PR are fixed before the PR is merged.	2022-04-14 20:05:42 +01:00