> > Hi All > > We are using 1.6 SVN. > We like to svn merge from our branch A to trunk. > We have been diligent in svn merge from trunk to A. > These svn merges from trunk to branch A also include --record-only merges > too, in addition to regular merges. > Development on branch A has stopped. > Now we like to merge branch A to trunk using --reintegrate option. > But we dont know what to expect if using this option fails on us. > > 1) Suppose svn merge --reintegrate fails on us on a working copy that has > all the mergeinfo list information. > Could we perform a clean co of branch A into another working copy and then > perform svn merge --reintegrate to trunk there ? > Will we get more conflicts simply because the new working copy doesnt have > the mergeinfo list like the first working copy of branch A ? > Will this plan B work ? >
> 2) How do we resolve conflicts during svn merge --reintegrate process ? > Would you share the steps for us to make the merge go smoothly ? > 3) Is mergeinfo a global or local property ? it seems that whenever a new checkout is done, mergeinfo list matches up with other working copies of the same branch. > > > Any help is appreciated. > Sincerely >
