Skip to content

Hack the Gap 2020 project to build a platform for people to help people

License

Notifications You must be signed in to change notification settings

elleneub/rainbow-octopus

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Rainbow Ocotopus

For ui or api specific documentation, check out the README.md files in those folders.

Workflow

For this team directly committing to the master branch is disabled. Instead for each new feature folks should

  • Create a new branch
  • As they are working make periodic commits and pushes
  • When ready to merge the new feature into master, push to git
  • In github create a new pull-request
  • Take the link for the PR and drop it in the team chat or ask specific people to review it

Note! As other PR's are merged, your branch will fall behind and your PR will be unable to merge with master. When this happens, get the latest version of master on your machine, checkout your branch, and run git merge master to merge master into your branch. Then you will have to resolve any merge conflicts. When resolved, push your branch again and it should be ready for merging with master.

About

Hack the Gap 2020 project to build a platform for people to help people

Resources

License

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published