Bulletproof web design - Figure 7.3 The Compare Editor shows the difference
Figure 7.3 The Compare Editor shows the difference between the local workspace and the central repository. Here I have applied a modification to the PlayerTest.java file. In the upper window this file is embellished with an arrow to the right, indicating an outgoing change. The lower windows show the local version (left) and the repository version (right). You can edit the local version to resolve conflicts. Generally, you have the following possibilities for resolving a conflict: . Discard your own modifications and copy the new central version into the workbench. Your own code is lost! . Force your own version on the repository (but you should ask team members for permission). Other people s code is lost! . Manually merge the local version with the repository version. . Merge the local version with the repository version using the automated merge. . Open a new development branch (Team > Branch). The local version becomes the root of a new branch. Later you can merge this branch with the trunk. . Finally, you have the option to extract the local changes as a patch and send it to another team member. This team member can apply the patch and include it in the central version. Eclipse provides the necessary functions to extract patches (Team > Create Patch) and to apply patches to resources (Team > Apply Patch). If you don t want to fall out with other team members, you should use this option (delegating work to others) only if you do not have the necessary access rights to apply the changes yourself. 2. Finally, invoke the Commit function to write the local version to the repository. 134 Chapter 7
File Transfer Protocol comes together with anonymous ftp access with every FTP Web Hosting account we offer today. Enjoy burs table ftp transfers together with fast FTP connection.