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

Re: Reason for conflict?

From: David Summers <david_at_summersoft.fay.ar.us>
Date: 2005-06-10 00:08:53 CEST

I saved everything wrt to the conflict that I could think of and put it
for someone to peruse at the http://summersoft.fay.ar.us/~david/conflict
URL. I don't know if that is everything needed to diagnose it or not,
maybe log entries?

I "fixed" it by copying in the file from trunk, but I would really like to
understand why the merge didn't (seem to) do the right thing.

Thanks!

--
David Wayne Summers        "Linux: Because reboots are for hardware upgrades!"
david_at_summersoft.fay.ar.us PGP Key: http://summersoft.fay.ar.us/~david/pgp.txt
PGP Key fingerprint =  0B44 B118 85CC F4EC 7021  1ED4 1516 5B78 E320 2001
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 10 00:11:08 2005

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