Hi Stefan,
We don't use SVN in it's classic setup.
Well basically it is more a case of we don't actually do "releases".
We do all dev work locally.
A CRON job on the staging server; does an svn update - and that (staging) local
working copy becomes the staging delpoyment for our web application.
Stefan Sperling wrote on Wed, Nov 17, 2010 at 14:09:47 +0100:
> Note that you could also use the --accept="theirs-full" option to skip the
> interactive prompt.
>
In trunk, '--accept=tf' (using the shorthands from the interactive
resolver) also works. I've nominated the shorter spelling for 1.6.
You should probably also add --*ignore*-*ancestry* to that merge statement.
On Wed, Nov 17, 2010 at 8:09 AM, Stefan Sperling wrote:
> On Wed, Nov 17, 2010 at 11:00:25PM +1100, Gavin Beau Baumanis wrote:
> > I have been doing;
> > svn merge -r1:head trunk/somefile branches/somefeature/somefile
>
On Wed, Nov 17, 2010 at 11:00:25PM +1100, Gavin Beau Baumanis wrote:
> Hi there,
>
> I have a question about completely overwriting a destination file with a
> merge.
> I have been doing;
> svn merge -r1:head trunk/somefile branches/somefeature/somefile
>
> As long as I continue to choose "Their
Hi there,
I have a question about completely overwriting a destination file with a merge.
I have been doing;
svn merge -r1:head trunk/somefile branches/somefeature/somefile
As long as I continue to choose "Their File" for any / all conflicts;
My question is - will this actually give me a complete
