| <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> |
| <html> |
| <head> |
| |
| <meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > |
| |
| <meta http-equiv="Content-Type" |
| content="text/html; charset=ISO-8859-1"> |
| <meta http-equiv="Content-Style-Type" content="text/css"> |
| <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" |
| type="text/css"> |
| <title>Working with another user</title> |
| </head> |
| <body bgcolor="#ffffff"> |
| <h2> |
| Working with another user</h2> |
| <p>Instructions were given explaining how to create a project and |
| commit it to the repository. First a repository location was specified. |
| Next the project was shared with that location and the HEAD branch and |
| the resources were added then committed. </p> |
| <p>The repository currently contains the project and the two files |
| that were committed (file1.txt and file2.txt). </p> |
| <p>It's time to find that coworker (let's call him Fred) to work |
| through some steps with you (for the remainder your name is Jane). This |
| section will demonstrate how two |
| people can work on the same project and simultaneously commit changes |
| to the repository. Specifically, the following actions will be taken: </p> |
| <ul> |
| <li>Fred will import the project to his Workbench</li> |
| <li>Fred will make changes to file1.txt and file2.txt.</li> |
| <li>You will update these new changes and also add a new file called |
| file3.txt.</li> |
| <li>Fred will make more changes to some files while you change the |
| same files. Fred will release his changes first.<br> |
| </li> |
| <li>You will have to resolve the conflicts between files that you |
| both changed. </li> |
| </ul> |
| Here is some terminology commonly used to describe changes:<br> |
| <table border="0" cellspacing="0" cellpadding="3" width="568"> |
| <tbody> |
| <tr> |
| <td valign="top" width="71" align="left"> <b>incoming</b> </td> |
| <td valign="top" width="481" align="left">Changes that are in the |
| repository, which you have not yet updated to. </td> |
| </tr> |
| <tr> |
| <td valign="top" width="71" align="left"> <b>outgoing</b> </td> |
| <td valign="top" width="481" align="left">Changes that you are |
| committing. </td> |
| </tr> |
| <tr> |
| <td valign="top" width="71" align="left"> <b>conflict</b> </td> |
| <td valign="top" width="481" align="left">Both you and the |
| repository have modifications to the same resource. </td> |
| </tr> |
| </tbody> |
| </table> |
| |
| </body> |
| </html> |
