Using Git for Your Editor Trees Assignment

For the Editor Trees assignment, you will be doing team development. We want you to use a source control system called git. For this project you will be managing a repo and also using it to submit your assignment.

Step 1: Forking The Starter Repo

This step should only be done by one member of your Editor Trees team.

  1. Go to this URL: https://ada.csse.rose-hulman.edu/CSSE230/TermProject/editortrees
    You'll have to login with your rose credentials.
  2. Click "fork" and select your name as the namespace
  3. On the left hand side navigation pane:
    Click Settings | General
    Then in the main window click the Expand button next to Permissions
    After expanding Permissions, choose "Private" from the Project Visibility dropdown box
    Scroll down and click "Save Changes"
  4. Navigate to: Settings | Members
    Then in the main window invite your other team member as a "Maintainer" by typing their Rose-Hulman userID into the "Select members to invite" search box.
    Note: If GitLab does not recognize their userID, then they will need to point their browser to https://ada.csse.rose-hulman.edu/hollings and click "Sign In" and then login with their Rose credentials - this will make them show up in the search box
  5. Invite the CSSE 230 TA's, graders, and me to be Maintainers of your project so that we will have access to grade and/or give help:
    Invite: Joseph Hollingsworth, Anne Boxeth, Blake Mullalley, Abizer Naseem, Xinyu Shen
  6. Find your repo URL looking beneath your project's name on the main project page and clicking the dropdown box that contains "SSH" and changing it to "HTTPS".
    The URL will look like the following with the "XXXXXX" replaced with your Rose userID:
    https://ada.csse.rose-hulman.edu/XXXXXX/editortrees.git
    Click on the icon just to the right of your URL, this will copy the URL to your clipboard. On the next step you will paste it into a spreadsheet.
  7. Click on the following link that takes you to a Google sheet and enter in your URL next to your team name:
    Go to this spreadsheet and set the URL for your team
    Google Sheet for recording repo URL

Step 2: Checking out the Repo

This step should be done by everyone on your team.

  1. In your browser, go to https://ada.csse.rose-hulman.edu and verify that you have access to your project. Copy the Repo URL (the HTTPS version, not the SSH version).
  2. Open your Eclipse and go to File > Import > Git > Projects from Git
  3. Select "Clone URI"
  4. In the URI field paste the URL you took from the website. Host and repository path should get filled out for you
  5. In Authentication, enter your rose credentials (you might find it convenient to have it save these for you) and hit Next
  6. In branch selection make sure "master" is checked and click next
  7. In local destination, you can configure anywhere you like
  8. Select "Import existing eclipse projects" and select next.
  9. You should see "EditorTrees" on the list, make sure it's checked and select next
  10. You should see a folder for EditorTrees in your project browser

Step 3: Test Push and Pull

Have one member of your team make a change and push it. Here's how:

  1. In Eclipse, edit the EditTree.java file (add at the top of the file a JavaDoc comment, i.e., /** ... */ and put @author tag with your team name) and save it
  2. Right click on the project folder and select Team > Commit
  3. Verify that EditTree.java appears in your list of "Staged Changes"
  4. Add "added author" to the Commit Message
  5. Select Commit and push

Have the other members of your team pull the latest version (after doing Step 2 above)

  1. Right click on the project folder and select Team > Pull
  2. You might have to enter your credentials
  3. You should get the updated files

Step 4: Let's do this

You have the basics!

  1. Now its time to start working on the Editor Trees assignment

Done!

Good Advice for Minimal Merge Conflicts