Manta Interactive Ray Tracer Development Mailing List

Text archives Help


[MANTA] Re: strange svn conflict


Chronological Thread 
  • From: Abe Stephens <abe@sci.utah.edu>
  • To: Manta@sci.utah.edu
  • Subject: [MANTA] Re: strange svn conflict
  • Date: Tue, 10 May 2005 21:46:57 -0600


Abe Stephens wrote:

[abe@fisher ~/Manta]$ svn commit -m "Complete changes for AffineTransform -- branch should compile with these changes"
svn: Commit failed (details follow):
svn: Aborting commit: '/home/sci/abe/Manta/Core/Geometry/AffineTransform.cc' remains in conflict


After a quick google search, it looks like you have to remove temporary files manually after a conflict merge.

There is a decent example in the online svn book.

http://svnbook.red-bean.com/en/1.0/svn-book.html#svn-ch-3-sect-4.4

Abe



  • [MANTA] Re: strange svn conflict, Abe Stephens, 05/10/2005

Archive powered by MHonArc 2.6.16.

Top of page