This repo was created for students to submit their homeworks for review.
- fork this repository
- clone your fork to your local machine:
git clone https://github.com/YOUR_USERNAME/frontend-2019-homeworks.git - add this repository as an upstream:
git remote add upstream https://github.com/kottans/frontend-2019-homeworks.git - in your local repository, add a folder with your github name under
submissions
In your local repository:
-
git checkout master -
pull latest changes from upstream
masterbranch:git pull upstream master -
IMPORTANT! create new branch, name it according to task performed (aka feature branch):
git checkout -b dom-api-task. In this example feature branch is calleddom-api-task -
under your name folder, add a folder with task name (e.g.
js-dom) and put your code into the folderSee example file structure you are expected to have below:
-
commit your changes to newly created feature branch
-
push feature branch to your remote repository:
git push --set-upstream origin dom-api-task
- open a pull-request from your repository to this repository via GitHub web-interface
- ask course mentors for review in FE Questionarium chat, post a link to your PR as well
- if necessary, make changes, until your code will be approved and merged
When PR reports conflicts, on your local repo
git checkout master- pull latest changes from upstream
masterbranch:git pull upstream master - merge
masterbranch into your feature branch:git checkout dom-api-task && git merge master - resolve merge conflicts if there are any
- push updated feature branch to your remote repository:
git push origin dom-api-task
