Re: Can't synchronize branch with trunk

2013-03-01 Thread Kiren Pillay
Hi Bob, Its a standard merge command, that's why I haven't included it. Its a standard merge though, it should work as far as I know. Was wondering in what cases this issue would occur. I will try and get the logs for you. Regards Kiren On Fri, Mar 1, 2013 at 8:33 PM, Bob Archer wrote: > >

RE: Can't synchronize branch with trunk

2013-03-01 Thread Bob Archer
> Hi > I've encountered a strange problem, hopefully someone can help me here. > Below is a diagram of our repo > ->trunk--mod ABC-+ > + | > |  | >