Differences
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 18:25] – davegriffiths | lirec:version_control_guide [2009-02-04 18:34] – davegriffiths | ||
---|---|---|---|
Line 83: | Line 83: | ||
< | < | ||
- | This will merge everyone' | + | This will merge everyone' |
+ | |||
+ | < | ||
+ | $ svn update | ||
+ | C GraphNode.cpp | ||
+ | Updated to revision 150. | ||
+ | $ | ||
+ | </ | ||
+ | |||
+ | If you have a look at this file, it will indicate the line affected | ||
+ | |||
+ | <code> | ||
+ | <<<<<<< | ||
+ | void GraphNode:: | ||
+ | ======= | ||
+ | void GraphNode:: | ||
+ | >>>>>>> | ||
+ | { | ||
+ | for(vector< | ||
+ | i!=m_ChildNodes.end(); | ||
+ | { | ||
+ | if (*i!=NULL) | ||
+ | { | ||
+ | (*i)->Process(bufsize); | ||
+ | } | ||
+ | } | ||
+ | } | ||
+ | </code> | ||
+ | |||
+ | You can then choose which line to use. | ||
====Diffing==== | ====Diffing==== |