nolden
commented
7 years ago For archival reasons of the "dah" activities it would be nice to either create a tag or merge them with merge-strategy "ours", git help merge:
ours This resolves any number of heads, but the resulting tree of the merge is always that of the current branch head, effectively ignoring all changes from all other branches. It is meant to be used to supersede old development history of side branches. Note that this is different from the -Xours option to the recursive merge strategy.
Any concerns?
Von: Jean-Christophe Fillion-Robin notifications@github.com Gesendet: Montag, 28. August 2017 08:40 An: commontk/CTK Cc: Nolden, Marco; Mention Betreff: [commontk/CTK] Removing stale DICOM related branches (#747)
@ivowolfhttps://github.com/ivowolf @noldenhttps://github.com/nolden @pieperhttps://github.com/pieper In the next few days, I will be removing the following branches that haven't been updated in years. Let me know if you prefer we keep them:
- https://github.com/commontk/CTK/tree/dah-testing-soapui
- https://github.com/commontk/CTK/tree/ctk-for-mitk-dicom-retrieve-cleaned
- https://github.com/commontk/CTK/tree/dah
- https://github.com/commontk/CTK/tree/fix-dicomIndexerTest1
- You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://github.com/commontk/CTK/issues/747, or mute the threadhttps://github.com/notifications/unsubscribe-auth/AANXoZTmhdofthQrOdc8s2ry5cDfcfZvks5scmDSgaJpZM4PEIou.
pieper
@ivowolf @nolden @pieper In the next few days, I will be removing the following branches that haven't been updated in years. Let me know if you prefer we keep them: