Skip to content

Contributing

Deric Kwok edited this page Nov 27, 2020 · 9 revisions

For this repository, we're going with Forking Workflow mainly for simplicity.

If you wish to make changes to the master branch, simplify fork the repository which would create your own local repository. Any changes you make on your own forked repository would not affect any changes made on the main repository. It's recommended to create a different branch for every task you are assigned on your forked repository.

Don't know how to fork a repository or send a pull request?

Pull Request

Once you're satisfied with your changes commit and push to your local repository and send a pull request from the main repository. Provide a detailed description of what you changed and assign 2 reviewers who have recently worked on the files, if not just randomly assign 2 reviewers. Make sure, both of the reviewers approval your pull request before merging to master. Don't worry if there are any conflicts, we will sort of them when we are going to merge to master.

Not seeing recent updates on your fork repository?

  • Switch to master branch if you are not git checkout master
  • Add the parent as a remote repository, git remote add upstream https://github.com/cpp-css/frontEndFall2020.git
  • Run git fetch upstream
  • Run git rebase upstream/master
  • Run git push origin master

Clone this wiki locally