On 13/03 14.32, Seema Alevoor wrote: > Bjorn Munch wrote: > > On 13/03 13.03, Seema Alevoor wrote: > >>> As for the Targetdirs and Makefile you pointed out, I couldn't sync > >>> the changes so edited them manually so that diff disappeared. > >> But that way, I think, SCCS revision history would not get updated. > >> So that may cause issues during putback. Any reason why you couldn't sync ? > > > > I couldn't find any commands that seemed to work, and putback -n > > didn't say anything. I know I've done this before, I think it was > > putback -n that told me what to do. > > > > Yeah..putback -n usually displays a msg if there are any version differences. > If, for the changed files, 'bringover -n' doesn't show any conflicts or > updates, > then you are safe to do a putback.
I get it now, I had misunderstood the workings of the merge tool so last time I had to merge I actually didn't but made it look like I had. Happened again with two files this morning, which I have now resolved manually. - Bjorn
