Bill Roper (billroper) wrote,
Bill Roper

Because I So Love To Merge

Today, I tried merging the locking version -- which includes later changes from the current main line and two DLLs of mine that someone else thoughtfully deleted from the project and which I had to restore -- to my current working line where I'm trying to merge a bunch of changes from a three year old line where I was working on something. Unfortunately, something has gone wrong and I now have "evil twin" files for a bunch of the files that I restored to the locking version.

*thud* *thud* *thud*

Tomorrow, I'll try deleting the duplicates and see if I can keep the versions from the locking line. Maybe that will work...
Tags: clearcase, musings, work

  • Tired

    I hit the wall late this afternoon. Sleep will follow soon now, but I needed to finish going through the APBA cards for next season. In other news,…

  • It Floats!

    I was discussing some of the intricacies of floating point mathematics with Gretchen over lunch today, which eventually led to her saying, "'Field of…

  • The Map of Tiny Perfect Things

    Last night, Gretchen and I watched "The Map of Tiny Perfect Things" on Amazon Prime. We liked it a lot. It owes (and acknowledges) a substantial debt…

  • Post a new comment


    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded