close Warning: Can't synchronize with repository "(default)" (/var/svn/tolp does not appear to be a Subversion repository.). Look in the Trac log for more information.

Changes between Version 4 and Version 5 of TolDevelopment


Ignore:
Timestamp:
Feb 25, 2009, 4:18:21 PM (16 years ago)
Author:
Víctor de Buen Remiro
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • TolDevelopment

    v4 v5  
    5858{{{
    5959svn merge https://www.tol-project.org/svn/tolp/branches/my_trying_branch https://www.tol-project.org/svn/tolp/trunk trunk
    60 }}
     60}}}
    6161 1. If there is a conflict you will be asked in order to select one of two versions or pospone the decision. So you must monitorice the console from time to time.
     62 1. If there new or deleted files in the branch you must add or remove them manually.
     63 1. When there is no pendent conflict commit all changes
    6264