46 ◾ Software Engineering: The Current Practice
foo()
{
j = 1;
k = 2;
}
and
foo()
{
j = 1;
k = 3;
}
What information does diff tool produce after reading these two files?
3.7 What does merge tool do?
3.8 What is the conflict between two updates of a file? How does it arise
and how is it resolved?
3.9 What is the build and what is the result of a build?
3.10 Write a class that supports course grading; it contains an array where
each student is identified by an integer and has a course grade. ere
is also a method that can change the student grade and a method that
computes the grade point average for the class.
3.11 What is three-tier architecture?
3.12 How long does it ty