Docs: Small update to the how-to-release doc

iagox86 · Oct 19, 2015 · 1188e5e · 1188e5e
1 parent b8bdacb
commit 1188e5e
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/doc/how_to_do_a_release.md b/doc/how_to_do_a_release.md
@@ -2,6 +2,17 @@ This document is written more for myself than for the community. But if
 somebody else someday has to do a release (because, I dunno, I gave up
 DNS for NetBIOS), this could be helpful. :)
 
+## Merge!
+
+If there's a branch to merge, simply run:
+
+    git checkout master
+    git pull
+    git merge otherbranch
+    git push
+
+Super simple!
+
 ## Make sure the version number and docs are up to date
 
 Both client/dnscat.c and server/dnscat2.rb contain a version number at