This repository holds the communal knowledge of kitchen in the lab.
$ git clone git@github.com:idc-milab/milab-recipes.git$ git checkout develop$ git pull origin develop$ git checkout -b your_grandpa_recipe$ vim dessert/cake.recipe- Write a nice recipe that you would like to share with everybody. Make sure to change the names for the branch and for the recipe
$ git add dessert/cake.recipe$ git commit -m "Added best recipe ever"$ git push -u origin your_grandpa_recipe- Now is time to got to https://github.com/idc-milab/milab-recipes/compare and ask 2 of your collaborators to check your recipe to see is expressive enough and contains clear instrcuts and list of instructions
- At this time if you need to address comments repeat 5. to 9. and add as many commits you feel necessary
- When you got 2 recipe reviewes that approve your recipe you should make sure you have rebased on the latest dev
$ git checkout develop$ git pull origin develop$ git checkout your_grandpa_recipe$ git rebase develop- Fix the conflicts if any
- here you could as well push to origin your rebased branch, but you'll get an error, try to find out the best way to solve the problem
$ git checkout develop$ git merge --no-ff your_grandpa_recipe$ git push origin develop- Thank you for collaborating with your recipe