diff --git a/README.md b/README.md index 64457d5..cf508b1 100644 --- a/README.md +++ b/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) diff --git a/assets/link-to-mate-repo.png b/assets/link-to-mate-repo.png new file mode 100644 index 0000000..7f86441 Binary files /dev/null and b/assets/link-to-mate-repo.png differ diff --git a/assets/remote-list-after.png b/assets/remote-list-after.png new file mode 100644 index 0000000..0aa8241 Binary files /dev/null and b/assets/remote-list-after.png differ diff --git a/assets/remote-list-before.png b/assets/remote-list-before.png new file mode 100644 index 0000000..ea7a2af Binary files /dev/null and b/assets/remote-list-before.png differ diff --git a/html_settings/README.MD b/html_settings/README.MD new file mode 100644 index 0000000..11579be --- /dev/null +++ b/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. + +Снимок экрана 2022-08-17 в 15 01 43 diff --git a/pull-changes-from-mate-repo-guideline/pull-changes-from-mate-repo-guideline.md b/pull-changes-from-mate-repo-guideline/pull-changes-from-mate-repo-guideline.md new file mode 100644 index 0000000..be6e0c9 --- /dev/null +++ b/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: + +Remote list before + +2. Go to origin Mate academy repository and copy a link to it: + +Link to Mate academy repository + +3. Add another `remote` named 'upstream'. Pass link to Mate academy repository +you've recently copied: +``` +git remote add upstream +``` +4. Check that new remote was added: +``` +git remote -v +``` +you should see two connections now: + +Remote list after + +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.