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

Re: automatic merge - quick question

From: Michael Diers <mdiers_at_elego.de>
Date: Wed, 29 May 2013 12:25:50 +0200

On 2013-03-20 06:43, Z W wrote:
> We like to perform frequent automatic svn merges between our trunk and
> our branches but we don't have much experience with svn merging.
> We like to include this automatic and frequent merging process as part
> of our daily Hudson job.

You may wish to consider using Jigomerge[1] and its Hudson/Jenkins

[1] http://code.google.com/p/jigomerge/

[2] https://wiki.jenkins-ci.org/display/JENKINS/Jigomerge+Plugin.

Michael Diers, elego Software Solutions GmbH, http://www.elegosoft.com/
Received on 2013-05-29 12:26:30 CEST

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.