Re: automatic merge - quick question

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
plugin[2].

[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/