[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Conflicts with merge

From: Olivier Antoine <oliviera201304_at_gmail.com>
Date: Mon, 29 Apr 2013 21:45:39 +0200

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
Received on 2013-04-29 21:46:14 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.