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

..

codeql

Update codeql-config.yml

2020-07-07 13:09:32 +01:00

ISSUE_TEMPLATE

Change to the latest support link

2020-10-23 13:22:06 -07:00

prepare-test

Remove debugging output

2021-12-31 16:32:08 +00:00

workflows

Add a PR check to check for conflict markers

2022-04-14 20:05:42 +01:00

dependabot.yml

Fix dependabot ignore syntax

2021-09-14 12:42:41 -07:00

pull_request_template.md

Add a changelog

2021-05-19 15:19:36 -07:00

update-release-branch.py

Commit any conflicts during v1 backport to simplify release process

2022-04-14 16:08:38 +01:00