Page History

...

3. Merge branch changes into local copy of trunk (foo == last rev listed by the above svn log).
{{ cd working/copy/of/trunk
svn merge -r foo:HEAD svn+ssh://svn.mit.edu/zest/thalia-branches/thalia-UI1.0-sprint1/}}

4. Inspect merged files and resolve conflicts.

...