ClearCase: Working offline hijacking files, then checking out / merging

后端 未结 2 713
耶瑟儿~
耶瑟儿~ 2020-12-04 02:05

I\'m looking at a scenario where I have an offline clear case view and I modify files in this view clearing the read-only attribute (hijacking) on the files I modify then se

相关标签:
2条回答
  • 2020-12-04 02:34

    What about setuping a private branch, working on it, hijacking there files and then merging your private branch on the main branch?

    0 讨论(0)
  • 2020-12-04 02:36

    No you won't override anything while working offline.

    ClearCase has a reconcliation mechanism for a snapshot view, which, when you get back online, will allow you to:

    • search for all hijacked files
    • checkout those files
    • then checkin them, which is when ClearCase will prompt you for a merge, if any new version has been done on that file during your time offline.
      That merge will be a three-way merge with:
      • root version: the version before any modification by you or other
      • source version: the matest checkin version (done while you were offline)
      • destination version: your current file
    0 讨论(0)
提交回复
热议问题