GalileoSchool / website

0 stars 4 forks source link

Mega Pull Request #15

Closed AdrianJakubcik closed 3 years ago

AdrianJakubcik commented 3 years ago

This pull request should include all the changes requested for the Contact Us pull request, and on top of that also

  1. Added Dropdown to Navigation
  2. Admissions
  3. About Us
  4. Added Modal Module (without in-depth documentation; didn't have time yet)
  5. Hotfixes for various bugs I've encountered and were pointed out in Notion
ViliamVadocz commented 3 years ago

@AdrianJakubcik for your next pull request please do

git fetch upstream
git reset --hard upstream/master
git push --force

In order this does:

If you don't have upstream configured, do

git remote add upstream https://github.com/GalileoSchool/website

Why would you want to do this?

This gets rid off all the irrelevant commits that were already merged. This makes it easier for other people to see what your PR contributes.

It is also good practice to keep your fork's master the same as upstream/master, and then doing all changes of different branches of your fork.