Like all other files. SVN will resolve the conflicts as much as possible and the rest has to be resolved manually because SVN will mark in the file what it couldn't merge. CVS did the same.
Greetings, On 6/3/06, David Bronke <[EMAIL PROTECTED]> wrote: > How is history.txt going to work with the SoC branches? There will be > commits happening at different times in the branch and in head... when > the two are merged, how should history.txt be handled? > > Dave > -- > Lead Programmer > G33X Nexus Entertainment > http://games.g33xnexus.com/precursors/ > > v3sw5/7Hhw5/6ln4pr6Ock3ma7u7+8Lw3/7Tm3l6+7Gi2e4t4Mb7Hen5g8+9ORPa22s6MSr7p6 > hackerkey.com > > > _______________________________________________ > Crystal-main mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/crystal-main > Unsubscribe: mailto:[EMAIL PROTECTED] > -- Project Manager of Crystal Space (http://www.crystalspace3d.org) and CEL (http://cel.crystalspace3d.org) Support Crystal Space. Donate at https://sourceforge.net/donate/index.php?group_id=649 _______________________________________________ Crystal-main mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/crystal-main Unsubscribe: mailto:[EMAIL PROTECTED]
