From 8ebacb4a284f6e726584ae5ed2bb531a2f150897 Mon Sep 17 00:00:00 2001
From: Cagebreak Signing Key 1 <cagebreak_signing_key_1@cagebreak>
Date: Mon, 2 Mar 2020 17:49:49 +0000
Subject: [PATCH] Improve README

- Add working merge process specification
---
 README.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8117d1f..2912c06 100644
--- a/README.md
+++ b/README.md
@@ -74,13 +74,19 @@ it is merged into `master`, creating a new release, which is tagged and signed.
 Merging into master is always done by
 
 ```
-git merge --no-ff development
-git tag -u keyid version
-git push origin master
+git checkout development
+git pull origin development
+git checkout master
+git merge --squash development
+git tag -u keyid version HEAD
+git tag -v version
+git push --tags origin master
 ```
 
 and a log message roughly describing the features is added in the commit.
 
+In the past, our git history did not always reflect this scheme.
+
 ### Releases
 
 Release checklist