Changes between Version 14 and Version 15 of Be a CIVL developer

Timestamp:

01/09/17 20:41:24 (9 years ago)

Author:

ziqing

Comment:

--

Be a CIVL developer

@@ -26 +26 @@
 * CIVL uses Subversion to manage source code. The CIVL Subversion repository is structured in the typical way.  In particular, the repository contains directories named `trunk`, `branches` and `tags`.
 * To create a new branch from the trunk of a specific revision r to branches: `svn copy  svn://vsl.cis.udel.edu/civl/trunk@r   svn://vsl.cis.udel.edu/civl/branches/branch_name`. 
+* Once a new branch created, you can check out your new branch with the command: `svn co svn://vsl.cis.udel.edu/civl/branches/branch_name`.
+* Within your own branch, you can do any changes you want for your new feature and you can commit your changes to the svn server so that your won't lose your work.
 * To keep being updated with the latest trunk, go to your local branch directory, type:  `svn merge  svn://vsl.cis.udel.edu/civl/trunk  .`.
+* Frequent update can help you reducing the work of resolving conflicts when you decide to merge your branch back to trunk finally.
 * To merge your branch back to the trunk, go to your local branch directory, type: `svn merge .  svn://vsl.cis.udel.edu/civl/trunk`.
+* When you decide to merge your branch back to trunk, be sure you have resolved all conflicts against the trunk and all regression tests passed. Then one of the lead developer of CIVL will help you committing into the trunk after reviewing your work.