> -----Original Message----- > From: Rob Pointer [mailto:[email protected]] > Sent: 09 December 2011 12:45 > To: Randall Reynolds; Cooke, Mark; [email protected] > Subject: Re: Question > > I have been looking through this thread and it might be resolved. > > Can I ask why you are trying to merge from trunk into the > branch? The usual operation would be the other way around, > otherwise you can run into reflective merge issues.
Really? My understanding is that most merges are from trunk to branch to keep the branch up to date so that when you reintegrate back to trunk you hit less issues... ~ mark c > Rob
