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

Re: To decide whether merge should be done or not

From: Thorsten Schöning <tschoening_at_am-soft.de>
Date: Fri, 14 Feb 2014 12:16:36 +0100

Guten Tag ReshmaBabu,
am Freitag, 14. Februar 2014 um 11:49 schrieben Sie:

> If
> I try to block the commit based on certain conditions, the effort & time
> taken in resolving the conflicts is wasted

That depends on your conditions: If your condition is "don't merge on
sunday morning" you're right, because you don't need the merge or it's
results to check the current time, but in almost every other useful
case you need the result of the merge to check for your condition if
it is somehow based on code.

Mit freundlichen Grüßen,

Thorsten Schöning

-- 
Thorsten Schöning       E-Mail:Thorsten.Schoening_at_AM-SoFT.de
AM-SoFT IT-Systeme      http://www.AM-SoFT.de/
Telefon...........05151-  9468- 55
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04
AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
Received on 2014-02-14 12:17:17 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.