PDA

View Full Version : what to do when you have conflicts with SVN and jsbuilder will not open?



piston
8 Dec 2008, 8:37 AM
I'm getting the cannot have "'<' character" error which means I have a conflict with my jsb file and the one from SVN. I have a ".mine" file now too. How do I rectify this?

mjlecomte
8 Dec 2008, 8:46 AM
extreme way to fix is delete your directory and just check the whole thing out again. Or try deleting the mine file and the jsb file and do an update, it should bring in the latest copy from svn.

piston
8 Dec 2008, 9:05 AM
extreme way to fix is delete your directory and just check the whole thing out again. Or try deleting the mine file and the jsb file and do an update, it should bring in the latest copy from svn.
i actually just deleted the jsb file only and did an SVN update - seemed to work - thanks

watrboy00
8 Dec 2008, 7:43 PM
If you open the JSB file in notepad its just an xml document. Easy to fix and merge if need to.

Naples SEO
31 Dec 2008, 8:02 AM
i actually just deleted the jsb file only and did an SVN update - seemed to work - thanks

Same here, thanks