From 2bdb535a284bda2986e0b206b21ec0153d0ba6e8 Mon Sep 17 00:00:00 2001
From: Andrew Prifer <2991360+AndrewPrifer@users.noreply.github.com>
Date: Mon, 16 May 2022 12:57:19 +0200
Subject: [PATCH] Update CONTRIBUTING.md with merge instructions (#164)

Update CONTRIBUTING.md
---
 CONTRIBUTING.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3b92ad3..4d2c2b9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -273,3 +273,9 @@ convention for these branches should be:
 - `(feature|hotfix|docs)/[identifier]` or
 - an autogenerated branch name from a Github issue (On an issue without a PR,
   look under the "Development" sidebar heading for a "create a branch link")
+
+Squash & merge should be preferred most of the time to keep the main branch clean, unless the commit history is relevant, in which case rebase should be used.
+
+Always update your feature branch with a rebase from the main branch to make sure that you don't accidentally break main with an undetected conflict.
+
+Branches belonging to merged PRs should be deleted.
\ No newline at end of file