Рішеня для модуля Python Core

README.md

@@ -19,6 +19,7 @@
     ```
     python -m venv venv
     venv\Scripts\activate (on Windows)
+    source venv/bin/activate (on macOS)
     pip install -r requirements.txt
     ```
 
@@ -38,7 +39,11 @@
     git push origin develop
     ```
     - If you created another branch (not `develop`) use its name instead
-
+
+Note: if changes were added to GitHub task when you already forked it and 
+downloaded to your local machine, follow this 
+[guideline](./pull-changes-from-mate-repo-guideline/pull-changes-from-mate-repo-guideline.md) to pull changes.
+
 ## Create a Pull Request (PR)
 1. Open your repo on GitHub and create a `Pull Request` (PR)
     ![New PR button](./assets/new-pull-request-button.png)

html_settings/README.MD

@@ -0,0 +1,17 @@
+# Guidline how to change the default value of tablespaces for .html
+
+**Requirement**: use 2 tablespaces instead of 4 in `.html` files. 
+
+4 tablespaces are the default value in PyCharm. Here is a short guide on how to change default settings: 
+
+1. Open **PyCharm**.
+2. Open project.
+3. 1) **Go to `Preferences -> Editor -> HTML`** for macOS.
+   2) **Go to `Settings -> Editor -> HTML`** for Windows and Linux.
+4. Change these fields: 
+  - **tab size = 2**;
+  - **indent = 2**;
+  - **continuation ident 4**.
+5. Click the `Apply` button.
+
+<img width="979" alt="Снимок экрана 2022-08-17 в 15 01 43" src="https://user-images.githubusercontent.com/62181026/185140552-329c3258-f29d-4796-9505-b72eba6874a1.png">

pull-changes-from-mate-repo-guideline/pull-changes-from-mate-repo-guideline.md

@@ -0,0 +1,58 @@
+# How to pull changes from the Mate academy repository guideline
+
+### Problem:
+Sometimes mentors add changes to GitHub task when you already forked it and 
+downloaded to your local machine.
+
+### Solution:
+To get changes from Mate academy repository you have to add connection between this
+repository and your local machine and pull changes. Follow the instructions below.
+1. Open a terminal and type the command to see your remote connections:
+```
+git remote -v
+```
+you should see one connection to your forked repository:
+
+<img src="../assets/remote-list-before.png" alt="Remote list before" width="500"/>
+
+2. Go to origin Mate academy repository and copy a link to it:
+
+<img src="../assets/link-to-mate-repo.png" alt="Link to Mate academy repository" width="1000"/>
+
+3. Add another `remote` named 'upstream'. Pass link to Mate academy repository 
+you've recently copied:
+```
+git remote add upstream <copied_url>
+```
+4. Check that new remote was added:
+```
+git remote -v
+```
+you should see two connections now:
+
+<img src="../assets/remote-list-after.png" alt="Remote list after" width="500"/>
+
+5. Switch to `master` branch:
+```
+git checkout master
+```
+6. Pull changes from Mate academy repository:
+```
+git pull upstream master
+```
+7. Switch to your branch:
+```
+git checkout develop
+```
+Note: if you created another branch (not `develop`) use its name instead
+
+8. Rebase commits from your branch:
+```
+git rebase master
+```
+9. Push changes to GitHub:
+```
+git push origin develop -f
+```
+
+Now you can continue working on the task.