Coventions Guide: rename transition branches develop-black and develop-white respectively

Author: emanuel-schmid

doc/guide/Guide_CLIMADA_conventions.ipynb

@@ -212,12 +212,12 @@
     "   git fetch -t\n",
     "   ```\n",
     "   \n",
-    "2. Switch to your feature branch and merge `develop/white` (in order to get the latest changes in `develop` before switching to `black`):\n",
+    "2. Switch to your feature branch and merge `develop-white` (in order to get the latest changes in `develop` before switching to `black`):\n",
     "\n",
     "   ```shell\n",
     "   git checkout YOUR_BRANCH\n",
     "   git pull\n",
-    "   git merge --no-ff develop/white\n",
+    "   git merge --no-ff develop-white\n",
     "   ```\n",
     "   If merge conflicts arise, resolve them and conclude the merge as instructed by Git.\n",
     "   It also helps to check if the tests pass after the merge.\n",
@@ -236,10 +236,10 @@
     "   git commit\n",
     "   ```\n",
     "   \n",
-    "5. Now merge `develop/black`:\n",
+    "5. Now merge `develop-black`:\n",
     "\n",
     "   ```shell\n",
-    "   git merge --no-ff develop/black\n",
+    "   git merge --no-ff develop-black\n",
     "   ```\n",
     "   * If merge conflicts arise, resolve them and conclude the merge as instructed by Git.\n",
     "     Most conflicts will probably be resolved by choosing \"Ours\" over \"Theirs\" or the \"Current Change\" over the \"Incoming Change\".\n",