This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision | Next revisionBoth sides next revision |
| lirec:version_control_guide [2009-02-04 16:27] – davegriffiths | lirec:version_control_guide [2009-02-04 17:07] – davegriffiths |
|---|
| <code>svn update</code> | <code>svn update</code> |
| |
| This will merge everyone's changes (if any have been made) into your working directory. If there is a conflict (two people have changed the same line) it will emit an error message, and insert both lines into the source file in question with lots of <<<<<<<<< so it will be obvious what is going on. | This will merge everyone's changes (if any have been made) into your working directory. If there is a conflict (two people have changed the same line) it will emit an error message, and insert both lines into the source file in question with lots of >>>>>>>>>>>>>> so it will be obvious what is going on. |
| |
| ====Diffing==== | ====Diffing==== |
81.188.78.24