Hi, Trying to understand how merge works for svn,
I did a merge from a branch to trunk, and I get this: Skipped 'test1.c' -- Node remains in conflict U homo_script_sql.sql Skipped 'ARBO1' -- Node remains in conflict U homo_script_ddl.sql Skipped 't.dat' -- Node remains in conflict Skipped 'TEST1' -- Node remains in conflict G . Updated to revision 12. Summary of conflicts: Skipped paths: 4 I dont see how to solve these conflicts, how to do please? Regards Olivier
