Merge pull request #96 from silx-kit/rename-to-main

Fixes following renaming master branch to main

Author: payno

software_engineering/2_Git/2_git_training.ipynb

@@ -652,7 +652,7 @@
     "For example *fetch* and *merge* have default values for:\n",
     "\n",
     "* repository --> origin\n",
-    "* branch  --> master / main"
+    "* branch  --> main"
    ]
   },
   {
@@ -677,17 +677,17 @@
     "# git remote add co-worker https://gitlab.esrf.fr/<co-worker>/pypolynom.git\n",
     "```\n",
     "\n",
-    "2. merge those modifications on your master branch\n",
+    "2. merge those modifications on your main branch\n",
     "\n",
     "```bash\n",
-    "git checkout master\n",
+    "git checkout main\n",
     "git fetch upstream <branch>\n",
     "git merge upstream/main\n",
     "```\n",
     "or\n",
     "\n",
     "```bash\n",
-    "git checkout master\n",
+    "git checkout main\n",
     "git pull upstream/main\n",
     "```\n",
     "\n",