CMPS-3350 Lab-9 - Github

Demonstration of Github program update process ---------------------------------------------- Gordon will demonstrate this process now. • git clone # Get your group project. • branch [branch name] # Start a new branch. • checkout # Go to your branch. • modify some code # Write some program code. Test it. • git add # Stage the source file(s). • git commit # Commit the changes. • git checkout master # Go to the master branch. • git pull # See if any other changes while you worked. Resolve the conflicts. • git merge [branch name] # Merge your branch into the project! • git push origin master # Add your changes to the project. Now we will get a volunteer group member to show us this process using Github. Can I get a volunteer? Links: make a new branch and checkout go to the master branch git pull merge branch with master (google) merge your branch with master branch (stack overflow)