search

pharo-vcs / iceberg

Iceberg is the main toolset for handling VCS in Pharo.
MIT License
133 stars 84 forks source link

IceMergeResolutionRequest refers to morphic #1733

Open Ducasse opened 1 year ago

Ducasse commented 1 year ago 
defaultAction

    | window mergeMorph |
    mergeMorph := (IceTipMergeMorph forMerger: merge).

    mergeMorph
        fromDescription: merge sourceDescription;
        toDescription: merge targetDescription.

    window := mergeMorph newWindow
        title: 'Merge';
        yourself.

    window openModal.
    ^ mergeMorph merged

There is also IceTipMergePatchMorph.

Ducasse commented 1 year ago

This is the only reference to IceTipMergeMorph and if we remove it we will be able to remove the IceTipMergeMorph and IceTipMergePatchMorph