Git Merging Exercise

Purpose:

• Learn how to merge when there are code conflicts
• Learn how to interact with the remote repository

Preparation

• You may want to download the script used for the video.

This is an individual assignment.

Exercise

For this exercise, you should experiment with the merging files that have conflicts. You may use the code below or any code of your choice.

public class TheMotivator {
	public void feedback(int score) {
		if (score == 100)
			System.out.println("You're awesome");
		else if (score > 90)
			System.out.println("That's great");
		else if (score > 60)
			System.out.println("That's good ");
		else
			System.out.println("Well, what can I say?");
	}
	public static void main(String[] args) {
		TheMotivator tm = new TheMotivator();
		tm.feedback(60);
	}
}

Specific Requirements

This exercise is worth 5 points. Turn in a git log that contains at least two different branches that have been merged. NOTE: The point of this is to get comfortable with git, so you do not need to follow the demo exactly. The log should show some reasonable amount of branching and merging. You should do some merges with and without conflicts, although we won't be able to tell this from the log.

Remember that to create log file you do:

git log --pretty=format:"%s" --graph > mylog.txt

I would suggest you spend at least half an hour on this task (more if this is all new to you).