Skip to content

dwihdyn/lifeskill-be

Repository files navigation

Step-by-step Setup

  1. go to your codes directory
  2. `cd ..`
  3. `git clone https://github.com/dwihdyn/lifeskill-be.git`
  4. ignore this step if you create an environment already. else, go to terminal and run
    • `conda create -n lifeskill-be python=3.7`
    • `source activate lifeskill-be`
  5. move your codes to under 'lifeskill_web' directory
  6. run below code in terminal
    • `pip install -r requirements.txt`
    • `pip freeze > requirements.txt`
  7. branch out `git checkout -b whateverFeatureYouAreBuilding`
  8. put your codes accordingly to the boilerplate, make sure it works as usual, by running `flask run`
  9. once working, continue build your feature
  10. publish your codes into github
    • `git add .`
    • `git commit -m 'my feature - yourName'`
    • `git push origin whateverFeatureYouAreBuilding`
  11. Carry on until you've perfected your feature, and ready to be merged to master
  12. (IMPORTANT !!!!!!!!!!!) : MAKE SURE you are in the right branch! Type `git branch`. if it show "whateverFeatureYouAreBuilding" in green color, you on the right track

Done with your feature, ready to be merged to master

    Go to terminal and run :

  1. git checkout master
  2. git pull origin master # get all updates from the master that you've missed
  3. git checkout whateverFeatureYouAreBuilding
  4. git rebase master # put all of your features inside your branch on top of your master LOCAL
  5. git push origin whateverFeatureYouAreBuilding # upload your branch work + the updated master (to avoid conflict)
  6. Merge your branch to the master in github.com -> click 'n branches' -> 'New Pull Request'

if you stuck, let dwi know on slack

Remember to build one feature at a time! and good luck :)

=================================================================================

Some git command you can explore:

  • `git branch` : see all available branches
  • `git checkout branch-name` : change branch to branch-name
  • `git fetch origin other-people-branch` : to put other people (in progress) code into your local computer

About

To be deployed in Heroku

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Contributors 4

  •  
  •  
  •  
  •  

Languages