Changes between Version 2 and Version 3 of PLATFORM_INFRASTRUCTURE_OVERVIEW

Timestamp:

09/24/08 11:45:58 (17 years ago)

Author:

pavlina

Comment:

--

PLATFORM_INFRASTRUCTURE_OVERVIEW

@@ -113 +113 @@
 
  * Conflicts
-  * When two users (usr1 and usr2) edit the same file, usr1 commits the changes and then usr2 tries to commit a conflict occurs. Usr2 cannot commit, because usr1 has already made changes. Then merging should be done. As the merging tool of the Eclipse IDE is very poor, I suggest we use TortoiseMerge. Download TortoiseSVN from http://tortoisesvn.net/downloads. Install it. From the Eclipse IDE choose Window/Preferences/Team/SVN/DiffMerge/. Choose External editor and choose the !TortoiseMerge.exe. In the "Variables" line add the following options:
+  * When two users (usr1 and usr2) edit the same file, usr1 commits the changes and then usr2 tries to commit a conflict occurs. Usr2 cannot commit, because usr1 has already made changes. Then merging should be done. As the merging tool of the Eclipse IDE is very poor, I suggest we use !TortoiseMerge. Download TortoiseSVN from http://tortoisesvn.net/downloads. Install it. From the Eclipse IDE choose Window/Preferences/Team/SVN/DiffMerge/. Choose External editor and choose the !TortoiseMerge.exe. In the "Variables" line add the following options:
 /theirs:"${theirs}" /base:"${base}" /mine:"${yours}" /merged:"${merged}"
-Now you have integrated TortoiseMerge in Sublcipse. Whenever you get a conflict while trying to commit, choose /Team/Update. If the conflict can be automatically merged, it is done. Otherwise files with differences are created. Choose /Team/Edit Conflicts. TortoiseMerge opens and you can merge the files. On the left is the repository version, on the right your version, bellow are the results from the merge(you can edit this version). When you synchronize the files (no conflicts are left) save and from the Eclipse IDE choose /Team/Mark Resolved. You can commit now without conflicts for errors. Do visit http://tortoisesvn.tigris.org/TortoiseMerge.html for an intuitive five minutes tutorial on TortoiseMerge.
+Now you have integrated !TortoiseMerge in Sublcipse. Whenever you get a conflict while trying to commit, choose /Team/Update. If the conflict can be automatically merged, it is done. Otherwise files with differences are created. Choose /Team/Edit Conflicts. !TortoiseMerge opens and you can merge the files. On the left is the repository version, on the right your version, bellow are the results from the merge(you can edit this version). When you synchronize the files (no conflicts are left) save and from the Eclipse IDE choose /Team/Mark Resolved. You can commit now without conflicts for errors. Do visit http://tortoisesvn.tigris.org/TortoiseMerge.html for an intuitive five minutes tutorial on !TortoiseMerge.
 
 ==== M2 Eclipse ====