git.md

@@ -201,12 +201,12 @@ See the "tree of commits" graphically on your Windows PC:
 ```
 gitk --all
 ```
-Create a "merge request" (instead of pushing to `master`):
+Create a "merge request" (instead of pushing to the main branch named `main` - it is called `master` in older repository):
 * Do this on GitLab.
-* First, merge `master` into your branch.
+* First, merge `main` into your branch.
 * Check that your code works correctly and that you have not broken something (run the tests and check the results!)
 * Write some text explaining what you have done in your branch.
-* The other developers will receive an e-mail telling them that you want to update `master`.
+* The other developers will receive an e-mail telling them that you want to update `main`.
 * Wait for their comments and agreement before merging the merge request.
   
 Tag your project for a deadline (a "tag" is a string which identifies a particular commit of your project):
@@ -215,7 +215,7 @@ Tag your project for a deadline (a "tag" is a string which identifies a particul
 # Hints
 
 * Do not push unnecessary files! Add a `.gitignore` to your project. Always check that you do not send the numerical results of your code or the program binaries (executables) to GitLab. This is very important because it is not easy to remove files from the history stored on GitLab. 
-* Keep the `master` branch stable (it should always produce no errors during the build and all the tests should run successfully!).
+* Keep the `main` branch stable (it should always produce no errors during the build and all the tests should run successfully!).
 * Tell what you are currently doing to the other developers (using comments, issues, merge requests on GitLab... or by any other mean such as messenger, e-mails or, even better, face-to-face).
 * Most of the previous commands are integrated into [VS Code](Visual Studio Code). You can easily see the modified files, prepare a commit or resolve conflicts (through the GUI, with your mouse!).