GIT for OOP344 Projects
- 1 Command line or GUI Tools
- 2 Resources
- 3 Teams and their Repository
- 4 Clone the repository
- 5 Assign the issues
- 6 Branch the master repository
- 7 Work on the issue
- 8 Pull request
- 9 Review the code
- 10 Merge the code back to master repository
- 11 Pull the new changes to Local master repositories
Command line or GUI Tools
Please use any of the Tools you are more comfortable to work with git. There are several GUI interfaces that may make working with git easier for you. here are few examples: (feel free to add more if you know of any):
- Git Jungle Linux
- Linux Gui Git
- Tortois Git (Windows)
- Git Windows Explorer plugin (windows)
- github for Mac (Mac)
- Smart Git (Windows, Mac, Linux)
- GitX (Mac)
- SourceTree (Mac)
- Amazing article on how the work is done on a project using git branching. Read this and you will understand how it is done:Scott Chacon' Github Flow
- Lecture Video
Teams and their Repository
Logging to your github account you will notice that you are now member of a team that carries a similar name to your team name. Also you have full access to a repository with the same name.
Clone the repository
The first step is to clone the project repository, since it contains the initial files to start the project.
git clone firstname.lastname@example.org:Seneca-OOP344/REPONAME.git
REPONAME is the name of the project repository on github
Assign the issues
- check the Issues on The CIO Framework page and assign each of them to two members, one for development and another for code review and pulling the code back to master repository
- list all the issues in your team page that is built based on the team page template.
- create the issues on github assigning them to the team members
- It is recommended to create a milestone and attach /assign it to the issue for follow up
Branch the master repository
- Each team member now branches the master repository under a relative name to the issue she/he is working on.
git branch IssueNameOrID
- switch your repository to the branch created
git checkout IssueNameOrID
- Start your work and do the first add and/or commit
- push the branch back to github
git push --set-upstream origin IssueNameOrID
Work on the issue
- Never work on the master branch.
- Start working on the issue in the branch related to the issue committing regularly
- Push the changes to the branch back to github constantly to share.
- By doing this you can discuss your code and problems with your professor and team members and also demonstrate your work habits.
- push final changes to github
- when task is completed create a pull request to merge back the branch to the master repository.
- assign the pull request to the team member responsible for code review
Review the code
This is done by the student assigned to review this code
- Review the code and make sure it is proper and is working as defined in the issue.
- Share your concerns with your team-mates through the discussion board, attached to the issue/pull request.
- If there is problem, ask the person who wrote the code to revise and correct the mistakes
Merge the code back to master repository
- when ready, merge the branch back to the master branch
- Switch back to master
git checkout master
- make sure to pull all changed to your master from the server before merging
git merge IssueNameOrID
- Switch back to master
- resolve possible conflicts
- test the master repository one last time
- push changes back to github
- close the pull request.
http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging http://itactics.wordpress.com/2012/11/07/setting-up-git-local-and-github/ by DH, about problems when setting up SSH Key and cloning.
Pull the new changes to Local master repositories
Now all the team members call pull the changes into their local master repositories and branch for the next issue