From d36ab2e093fd3b63cb31174c411a770ddd742cb1 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 16 Mar 2020 15:27:59 +0100
Subject: [PATCH] merge

---
 doc/DEVELOP.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/DEVELOP.md b/doc/DEVELOP.md
index fc309dc8..a3aeadca 100644
--- a/doc/DEVELOP.md
+++ b/doc/DEVELOP.md
@@ -134,6 +134,11 @@ Create release branch:
   git push origin release-4.2
 ```
 
+Merge a branch back:
+```
+  git merge --no-ff release-4.2
+```
+
 ## Use of constants etc
 
 Use MAXPATHLEN (not PATH_MAX)