Skip to content

Commit c60f014

Browse files
committed
test restricted branch
1 parent 6bbab55 commit c60f014

1 file changed

Lines changed: 15 additions & 14 deletions

File tree

CONTRIBUTING.md

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
### Welcome
44

5-
This project is a part of [Web Development learning class](https://hattifnatt4r.github.io/sd). It is designed to help learn ReactJS, Python APIs, Database basics and more.
5+
This project is a part of [Web Development learning class](https://hattifnatt4r.github.io/sd). It is designed to help learn Git, HTML, CSS, JavaScript.
66

77
See our Discord server for details (https://discord.gg/wAMEqRMbdm), or meet us in person at the Cambridge Public Library.
88

@@ -11,23 +11,24 @@ Please contact organizers through Discord or email if you're an experienced deve
1111

1212
See README.md for the details about the app.
1313

14-
# Contribution workflow
14+
### Contribution workflow
1515

16-
### Environment setup
17-
18-
* Fork this repository
19-
* Clone it locally
20-
* Double-click index.html file on your computer, it will open the web page in browser
21-
* Add the original repo as upstream
22-
* Create a new branch
23-
* Make your changes in the branch. Commit and push
24-
* Sync with upstream. Resolve conflicts if any
25-
* Push and create a pull request
16+
* Make sure you're a member of https://github.com/cambridge-devclass
17+
* Clone this repository to your local machine.
18+
* Run the app locally: <br>
19+
Double-click index.html file on your computer, it will open the web page in browser.
20+
* Create a new branch from "main". Checkout to your branch.
21+
* Make your changes, commit.
22+
* Rebase your branch against the "main". Resolve conflicts if any. Push changes to your remote branch.
23+
* Create a pull request on GitHub to merge changes from your branch to master.
2624

2725
(We’ll cover the details during class.)
2826

2927
### Deployment
3028

31-
When your pull request is merged, GitHub pages will update automatically in a few minutes.
32-
See the link in README.md.
29+
We're using GitHub pages for this project.
30+
When your pull request is merged, the app will be updated automatically in a few minutes. URL: https://cambridge-devclass.github.io/welcome--js
31+
32+
You can see deployment status in https://github.com/cambridge-devclass/welcome--js/deployments
33+
3334

0 commit comments

Comments
 (0)