Gavin wrote: > From: David Crossley > > Gavin wrote: > > > From: Gavin wrote: > > > > > > > > I notice forrest site is down. > > > > > > > > On inspection, our .htaccess is messed up with <<<<<MINE etc etc.. > > > > > > > > Attempting to fix on mino then will svn up. > > > > > > I have removed all version clashes such as :- > > > > > > rm -rf .htaccess > > > rm -rf.htaccess.mine > > > rm -rf .htaccess.r695133 > > > mv .htaccess.r695140 .htaccess > > > > There must have been manual changes on the server that > > were not added to our SVN. > > Strange, I looked at yesterdays backup on bia and there were no version > conflicts.
No becuase i only made the SVN change to .htaccess in the last few hours. That will be the file that we need. It should have the local changes. -David
