I am getting problems merging changes with filemerge. Basically filemerge does not have the options of accept child and accept parent as it does with teamware. This is causing problems.
I have tried accept parent changes to the EOF but it is not giving me what I want. Just to understand by workspaces. I make all my changes in a workspace that I use for building X86. This includes using recommit. I have a clone of the X86 workspace which I use for building sparc. It is this clone where I am getting the problems when I do a pull and merge. Regards Julian
