Skip to content

Commit b478eef

Browse files
OleksiyRudenkoAMashoshyna
authored andcommitted
README.md: Add instructions on updating fork (#27)
1 parent 68dd7cc commit b478eef

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ instead of `npm`.
1313
- clone your fork to your local machine: `git clone https://github.com/YOUR_USERNAME/nodejs-2019-homeworks.git`
1414
- add this repository as an upstream: `git remote add upstream https://github.com/kottans/nodejs-2019-homeworks.git`
1515
- for every new task you're gonna submit, in your local repository:
16-
- `git checkout master` and then create new branch, name it according to task performed (aka feature branch): `git checkout -b port-sniffer`. In this example feature branch is named `port-sniffer`
16+
- `git checkout master && git pull upstream master && git push origin` to update your fork from the base repo
17+
- `git checkout master` and then create new branch, name it according to task performed (aka feature branch): `git checkout -b port-sniffer`. In this example feature branch is named `port-sniffer`.
18+
Make sure you never commit into `master` directly or you may face code conflicts.
1719
- add a folder with your github name under `submissions` (if you haven't yet)
1820
- under your name folder, add a folder with task name and put your code in the folder
1921

0 commit comments

Comments
 (0)