1 Gitting Started

Fire up your installation of Eclipse.

Let’s let it know about your key. Go to Window ⇒ Preferences ⇒ General ⇒ Network Connections ⇒ SSH2 ⇒ General. Add your private key.

1.1 Fetching changes

Back in your ssh session, give the command

~zeil/Assignments/cs350/gitLab/step2

This is simulating someone else on your team working on the same project. In Eclipse, right-click on your project and select Compare with... ⇒ HEAD revision. This compares against the most recent check-in to your local copy of the repository. Since you have not made any changes yet, you should not see much of anything, maybe a few new files created when you compiled.

Now try Compare with... ⇒ branch, tag, … Select “Remote tracking” and then “master”. This compares against the remote repository, and you should be able to see that your mysterious teammate has checked in some changes.

In the synchronization view, find the file that has changed and double-click on it to open up the comparison editor.

Most of the version control commands are accessed by right-clicking on the project and looking under the Team menu item. Return to the Java perspective and use that to the changes from the remote repository.

1.2 Committing changes

Try making some simple changes, such as editing some of the comments in the source code.

From the Team menu item, commit your changes. As you examine the “commit” dialog, you will see that you have the option of doing a simple local commit or of doing a commit followed by an immediate push to the remote repository. Go ahead and push.

2 Coping with Conflict

Back in your ssh session, give the command

~zeil/Assignments/cs350/gitLab/step3

In your Eclipse session, refactor the Pie.getBaseColor and Pie.setBaseColor functions, renaming them to getBackgroundColor and setBackgroundColor. By using the “refactor” menu, you get all calls to that function to be changed at the same time.

Now try to commit and push your changes. The commit should work, but the push fails because your mysterious teammate has already checked in some more changes to the project.

See if you can resolve this conflict and eventually commit and push a combination of your changes and those of your teammate. You will need to

• fetch the changes from the remote repository,
• force a merge between your local HEAD revision and the remote’s “master” head, if that doesn’t happen when you fetch the changes
  • Although Eclipse and git will be able to handle the merge in some files automatically, they will not be able to handle all of them, because there are some lines in one file that have been changed by both you and your simulated teammate.
• Use the Eclipse conflict editor to combine the changes between the opposing versions of the conflicted file.
• “Add” the resolved file back into the index as a signal that you are satisfied that the conflict has been resolved.
• Commit and push the change again.

3 Finishing Up

The remote repository for this lab was stored in your Linux account as ~/.cs350gitlab.

To clean up after the lab (or to reset to the beginning if you want to start it over from the beginning), do

rm -rf ~/.cs350gitlab