Re: Auto merge to Trunk?

[Prakash Subramanian]

>>> Kaz Kylheku <address@hidden> 01/03/03 16:56 PM >>>
On Fri, 3 Jan 2003, Prakash Subramanian wrote:

> I would like files to be merged to trunk whenever files are checked
> in to a particular branch,
> Is there a way to achieve this?
> Basically, the branch I am referring to is the production branch and
> any bug fixes that get checked in to production needs to be merged to
> trunk

How will the machine resolve conflicts?

I am ok with it if it tries to merge to trunk and when conflicts arise lets the 
user know that conflicts were found.