From 5077cdf0da14bf9e7f6311372e81a50406d511ea Mon Sep 17 00:00:00 2001
From: Zakaria El Asri <33696020+zakariaelas@users.noreply.github.com>
Date: Thu, 30 Jun 2022 09:59:50 +0100
Subject: [PATCH] chore: add kodiak (#1745)

* add: kodiak

* add: notify_on_conflict and move to .github
---
 .github/.kodiak.toml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/.kodiak.toml

diff --git a/.github/.kodiak.toml b/.github/.kodiak.toml
new file mode 100644
index 0000000000..f97cf85d58
--- /dev/null
+++ b/.github/.kodiak.toml
@@ -0,0 +1,20 @@
+#.kodiak.toml
+version = 1
+
+[merge]
+automerge_label = "automerge"
+require_automerge_label = true
+blocking_labels = ["on hold", "wip", "blocked"]
+method = "squash"
+delete_branch_on_merge = true
+optimistic_updates = false
+prioritize_ready_to_merge = true
+notify_on_conflict = true
+
+[merge.message]
+title = "pull_request_title"
+body = "pull_request_body"
+include_coauthors= true
+include_pr_number = true
+body_type = "markdown"
+strip_html_comments = true
\ No newline at end of file