geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jason Dillon <>
Subject Re: Need a web site update
Date Mon, 24 Jul 2006 20:30:06 GMT
Did you just change the site directly on /www/* ?

Changes like that are bound to cause problems if someone changes  
something and then `svn up` the workspace.

Chances are this is what happened before... otherwise there should  
not have been conflict markers in the page.


On Jul 24, 2006, at 1:24 PM, Jeff Genender wrote:

> Very weird...I just fixed it...let see if it sticks.
> Aaron Mulder wrote:
>> Jeff and Matt -- you are each twice the man I am!
>> At least, according to the committer page:
>> Thanks,
>>    Aaron
>> P.S. It also has SVN merge errors in the HTML!!!  Looks like maybe
>> someone updated the site by hand and then the next run of the update
>> script busted it?

View raw message