From 5aeb0424fc0bc450a9a1b70b9782b3ddafb8003b Mon Sep 17 00:00:00 2001 From: rocky Date: Mon, 5 Feb 2018 06:37:50 -0500 Subject: [PATCH] Administrivia --- admin-tools/how-to-make-a-release.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/admin-tools/how-to-make-a-release.md b/admin-tools/how-to-make-a-release.md index 2c9430f0..4d3ecf02 100644 --- a/admin-tools/how-to-make-a-release.md +++ b/admin-tools/how-to-make-a-release.md @@ -45,6 +45,8 @@ $ source admin-tools/setup-python-2.4.sh $ git merge master + # Add and fix merge conflicts + $ git commit # Check against older versions