moxjet200/CoLearningApp1 — pull request #1 by kimjune01 (2014-12-06 21:34:19+00:00)
Title: added a label with text 'cool new feature'

Hey guys,

1. From Github, Fork the repository to your own account's domain.

1. Click 'clone to desktop' or from command line 'git clone https://github.com/user/repository' to make a localized version of the repository.

2. Make a new feature branch called whatever you want. Using 'git branch', you can see the list of branches. With 'git log', you can see the latest of the commits made in the repository that you're working with.

3. Make some changes to the files by adding stuff, making new files, etc. then 'git add -A' to make sure that all your files are being tracked and staged. Once the changes are staged, you can 'git commit' with a message that describes the work you've done since the last commit. You can see that I've added a label to the viewcontroller.

4. When you type 'git push origin branch-name' in command line, Github will update after you put in your credentials. If you go to the repository that you've forked from, there will be a big green button that says 'compare and make a pull request'. By having different branches, we make sure that the pull requests being made will not have commit-level conflicts. Github has cool features to help you sort through the conflicts.

For best results, work on a single repository(only one person codes) until there is enough work to be divided up between the members of the team. When working on different repositories, make sure that only one person merges branches into the master/origin and that master/origin branch is always functional. New features should be on branches until they are merged by the team lead in the main repository. This way, conflicts are minimized.

In case that there are multiple forks of the same repository, you may need to rebase your repo before you are allowed to pull into the main repository. There's other cool things that can be done with Git that will help you code without worrying about if you'll screw over someone else's work.

I encourage everyone to go through the exercise I've laid out above and ask any questions if needed.