CS 2113 Software Engineering - Fall 2023 | CS 2113 Software Engineering.

Table of Contents

^ Top of page

View the video explainer for this lab on youtube

Lab 0_5: Git Deep Dive #

The goal of this lab is to get you more comfortable with using more advanced features of git, such as branching, resolving conflicts, and forking.

Instructions #

  1. Create a repository on github titled <github_username>-lab0.5 (replace <github_username>). Make sure it is private)

  2. Add the grader as a collaborator

  3. Clone the repo onto your computer

  4. On the master branch, create a file called HelloWorld.java (just like we did in lab 0). Write a program to print “Hello World”

  5. add, commit, and push to the master branch

  6. Create a new branch using terminal commands (you can name the branch whatever you would like)

  7. On the new branch, change the print message in HelloWorld.java (to whatever you would like, but it must be unique)

  8. add, commit, and push to the new branch

  9. Return to the master branch

  10. Change the print statement (again) in the HelloWorld.java file (to something unique), this time on the master branch

  11. add, commit, and push to the master branch

  12. Merge the code from your new branch to the master

  13. Take a screenshot of the merge conflict you receive. You can take a picture of terminal, which indicates that there is a merge conflict; You can take a picture of the HelloWorld.java file, which contains markings to indicate that there is a merge conflict; You can take a picture of both.

  14. Resolve the merge conflict

  15. commit and push to Github on master

  16. push the screenshot of the merge conflict to Github

Troubleshooting #

Problem: git is asking me do set something called upstream?

The first time you push to a branch, git may ask you to set the upstream to a specific remote server; you can just follow the instructions it prints to the terminal to set the upstream to the correct remote branch.

Problem: I forgot to push to master before making a new branch!

It happens! Just make another branch, and push to it. You should end up, eventually, with two branches; that’s all that matters for this lab.

Grading Rubric #

Item Points
the name of the repo for this lab matches the pattern gitusername-lab0.5 10
the grader has been added as a collaborator to the repo 10
the repo has been made private 10
there are (at least) two branches 10
there are (at least) three commits in master (should be the case if instructions are followed correctly) 10
there is (at least) one unique commit in the new branch 10
the first commit of HelloWorld.java in master differs from HelloWorld.java in the new branch 10
there are no remnants of a merge conflict in the final commit to master 10
screenshot proves that you did (at one point) have a merge conflict 20
TOTAL 100