Software Development Cross Solution - Index of - Free

The server tries to MERGE your changes
If two people make changes to the same file but in different places,
most version control systems try to merge the changes together. This
isn’t always what you want, but most of the time it works great.
Nonconflicting code and methods are easy
In BeatBox.java, you added a playPoke() method, so the code
on the version control server has that method. But Bob’s code has no
playPoke() method, so there’s a potential problem.
Bob’s BeatBox.java
Nothing here... Bob has no
code for playPoke() at all.
Your version control software will combine files
In a case like this, your version control server can simply combine
the two files. In other words, the playPoke() method gets
combined with nothing in Bob’s file, and you end up with a
BeatBox.java on the server that still retains the playPoke()
method. So no problems yet...
But conflicting code IS a problem
But what if you have code in the same method that is different? That’s
exactly the case with Bob’s version of BeatBox.java, and the
version on the server, in the run() method:
The version on the server has
a playPoke() method.
BeatBox.java
version control
if (nameToShow.equals(PICTURE_START_SEQUENCE)) {
receiveJPEG();
} else {
if (nameToShow.equals(POKE_START_SEQUENCE)) {
otherSeqsMap.put(nameToShow, checkboxState); playPoke();
listVector.add(nameToShow);
nameToShow = "Hey! Pay attention.";
incomingList.setListData(listVector); }
}
otherSeqsMap.put(nameToShow, checkboxState);
listVector.add(nameToShow);
incomingList.setListData(listVector);
Bob’s BeatBox.java
private void playPoke() {
Toolkit.getDefaultToolkit().beep();
}
Download at WoweBook.Com
These two bits of code are in the same place,
but it’s not clear how to merge them.
BeatBox.java
you are here 4 193