From 2ed848dd85df6b6994b00311d5c3583459725d00 Mon Sep 17 00:00:00 2001 From: Heston Hoffman Date: Thu, 21 Nov 2024 10:03:53 -0800 Subject: [PATCH 1/4] Catch merge conflict annotations --- styles/Datadog/merge_conflict.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 styles/Datadog/merge_conflict.yaml diff --git a/styles/Datadog/merge_conflict.yaml b/styles/Datadog/merge_conflict.yaml new file mode 100644 index 0000000..cb4ead7 --- /dev/null +++ b/styles/Datadog/merge_conflict.yaml @@ -0,0 +1,7 @@ +extends: existence +message: "It looks like you missed a merge conflict! Fix the conflict and try again." +link: 'https://github.com/DataDog/documentation/blob/master/CONTRIBUTING.md' +ignorecase: true +level: error +tokens: + - '\<\<\< HEAD' From fc65b349e4e91b5849dbb36cd627008b23d2fa60 Mon Sep 17 00:00:00 2001 From: Heston Hoffman Date: Thu, 21 Nov 2024 10:06:13 -0800 Subject: [PATCH 2/4] Update styles/Datadog/merge_conflict.yaml --- styles/Datadog/merge_conflict.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/Datadog/merge_conflict.yaml b/styles/Datadog/merge_conflict.yaml index cb4ead7..2fc8e2f 100644 --- a/styles/Datadog/merge_conflict.yaml +++ b/styles/Datadog/merge_conflict.yaml @@ -4,4 +4,4 @@ link: 'https://github.com/DataDog/documentation/blob/master/CONTRIBUTING.md' ignorecase: true level: error tokens: - - '\<\<\< HEAD' + - '\>\>\>\>\>\>\>' From 4f86312d3680f3f95edabde07cb732aa1f15fcc0 Mon Sep 17 00:00:00 2001 From: Heston Hoffman Date: Thu, 21 Nov 2024 10:08:01 -0800 Subject: [PATCH 3/4] Update styles/Datadog/merge_conflict.yaml --- styles/Datadog/merge_conflict.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/Datadog/merge_conflict.yaml b/styles/Datadog/merge_conflict.yaml index 2fc8e2f..e58d4ed 100644 --- a/styles/Datadog/merge_conflict.yaml +++ b/styles/Datadog/merge_conflict.yaml @@ -4,4 +4,4 @@ link: 'https://github.com/DataDog/documentation/blob/master/CONTRIBUTING.md' ignorecase: true level: error tokens: - - '\>\>\>\>\>\>\>' + - '/^[<=>]{7}( .+)?$/mg' From e165c1e5802858c536604ca73d5cf7c2c997e212 Mon Sep 17 00:00:00 2001 From: hestonhoffman Date: Thu, 21 Nov 2024 11:35:36 -0800 Subject: [PATCH 4/4] Fix merge conflict rule --- styles/Datadog/merge_conflict.yaml | 7 ------- styles/Datadog/merge_conflict.yml | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 styles/Datadog/merge_conflict.yaml create mode 100644 styles/Datadog/merge_conflict.yml diff --git a/styles/Datadog/merge_conflict.yaml b/styles/Datadog/merge_conflict.yaml deleted file mode 100644 index e58d4ed..0000000 --- a/styles/Datadog/merge_conflict.yaml +++ /dev/null @@ -1,7 +0,0 @@ -extends: existence -message: "It looks like you missed a merge conflict! Fix the conflict and try again." -link: 'https://github.com/DataDog/documentation/blob/master/CONTRIBUTING.md' -ignorecase: true -level: error -tokens: - - '/^[<=>]{7}( .+)?$/mg' diff --git a/styles/Datadog/merge_conflict.yml b/styles/Datadog/merge_conflict.yml new file mode 100644 index 0000000..62604cd --- /dev/null +++ b/styles/Datadog/merge_conflict.yml @@ -0,0 +1,7 @@ +extends: existence +message: "It looks like you have a merge conflict! Fix the conflict and try again." +link: "https://github.com/DataDog/documentation/blob/master/CONTRIBUTING.md#dashes" +nonword: true +level: error +tokens: + - '^[<|=|>]{7}( .+)?$'