/Git-Cheatsheet

Git Cheatsheet

Structure should be that the master branch is your release branch, development branch is the beta/alpha branch, and each dev has their own branch that feeds into development.

  1. Develop on your branch
  2. commit often!

Setup Instructions

ONE member of your group...

  1. On the master branch, create and add a gitignore file (gitignore generator)
  2. Create a development branch
  3. Create a branch for each member of your team
    • yourself included
  4. Once this is completed, everyone else can clone the repo and checkout their branch to then be able to complete the merging instructions.

Merging instructions

... when you complete a feature or fix a bug...

  1. make a commit stating your progress
  2. checkout the development branch and pull in the latest changes from github
    • git checkout development
    • git pull
  3. merge your personal branch into development
    • git merge [myBranchNameNoBrackets]
  4. more than likely, you will have merge conflicts. git tries to make this easy with text formatting, but let's face it... it's not easy to understand what it means. Use something like gitkraken to make the process infinitely easier for you.
  5. commit your resolved conflicts
  6. push development back up to github
  7. checkout your branch again
    • git checkout [myBranchNameNoBrackets]
  8. merge development into your branch
  9. push your branch changes up to github
  10. continue working on your contributions

iOS Tips

  • Use storyboard references liberally and assign specific individuals to be the only ones to make changes to their own storyboards
    • merge conflicts involving storyboards are worse than stepping on legos - they WILL happen, but you can reduce your headache by being vigilant about NOT making changes on a storyboard unless you are specifically designated as the owner of that storyboard.