TRAAN CHITRO

Notes and Conventions

 
Branch Naming:

• Frontend branches - "frontend-NAME" - replace 'NAME' with the intended branch name
• Backend branches - "backend-NAME" - replace 'NAME' with the intended branch name

 
Branch Usage Rules:

• DO NOT push to "master" under any circumstance
• Once you have completed work on your branch, make a pull request and we will merge the branch together
• Try not to work on the same files concurrently with another person

 
Tips To Avoid Conflicts (not mandatory, but recommended for amateurs like us):

• When you start working on a file, add a comment to the top of the file - "LOCKED BY - [YOUR NAME]"
• Then make a commit with the message - ":lock: File lock commit"
• When you finish working on a file and want to withdraw the lock, remove the comment from the top of the file
• Then make a commit with the message - ":unlock: File unlock commit"
• If you don't know how to add those little lock and unlock emojis at the beginning of the message, refer to the General Tips section below this

 
General Tips:

• If you haven't used git emojis, refer to these links -
  • https://gist.github.com/parmentf/035de27d6ed1dce0b36a
  • https://gitmoji.carloscuesta.me/
  • https://www.webfx.com/tools/emoji-cheat-sheet/
• If you want a good tutorial on how to use git, refer to these links -
  • https://learnxinyminutes.com/docs/git/
  • https://github.github.com/training-kit/downloads/github-git-cheat-sheet/

 

WORK ORGANIZED AND HAVE FUN