[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge non-interactive - What does it mean

From: Silver Zachara <silver.zachara_at_gmail.com>
Date: Thu, 21 Aug 2008 17:29:39 +0200

Stefan Küng napsal(a):
> Silver Zachara wrote:
>
>> Ciao,
>>
>> What does mean the checkbox Merge non-interactive in merge dialog when I
>> click merge. I didn't find anything in a Help.
>>
>
> If "non-interactive" is set for a merge and the merge would result in a
> conflict, the file is marked as in conflict and the merge goes on. You
> will have to resolve the conflicts after the whole merge is finished.
> If it's not set, then before a file is marked as conflicted you get the
> chance to resolve the conflict *during* the merge. This has the
> advantage that if a file gets multiple merges (multiple revisions apply
> a change to that file), subsequent merges might succeed depending on
> which lines are affected. But of course you can't walk away to get a
> coffee while the merge is running ;)
>
>
> Stefan
>
>
>
I understand, thank you.

-- 
-------------------------------------------------------------------
                      --== Silver Zachara ==--
- pgp - http://radeonvmod.ic.cz/keys/silver.zachara@gmail.com.asc -

Received on 2008-08-21 17:29:45 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.