fork-dev / Tracker

Bug and issue tracker for Fork for Mac
502 stars 12 forks source link

Do not resolve conflict if I remove conflicting string #690

Open murabye opened 5 years ago

murabye commented 5 years ago

I have next conflict

    <inferredMetricsTieBreakers>
        <segue reference="pvv-zP-yV7"/>
    </inferredMetricsTieBreakers>

and

    <inferredMetricsTieBreakers>
        <segue reference="pvv-zP-rz5"/>
    </inferredMetricsTieBreakers>

so I need to remove both conflicting strings (recommended path in iOS Storyboard development), but I can not do it because of conflict message do not disappear :(

DanPristupov commented 5 years ago

What conflict message? Could you show a screenshot please?


From: varya notifications@github.com Sent: Tuesday, July 30, 2019 3:49 PM To: ForkIssues/Tracker Cc: Subscribed Subject: [ForkIssues/Tracker] [macOS] Do not resolve conflict if I remove conflict string (#690)

I have next conflict

<inferredMetricsTieBreakers>
    <segue reference="pvv-zP-yV7"/>
</inferredMetricsTieBreakers>

and

<inferredMetricsTieBreakers>
    <segue reference="pvv-zP-rz5"/>
</inferredMetricsTieBreakers>

so I need to remove both conflicting strings (recommended path in iOS Storyboard development), but I can not do it because of conflict message do not disappear :(

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHubhttps://github.com/ForkIssues/Tracker/issues/690?email_source=notifications&email_token=AAEW5A5FDTKP7F3J3PTEYE3QCA2GXA5CNFSM4IH37DH2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HCJJTJQ, or mute the threadhttps://github.com/notifications/unsubscribe-auth/AAEW5A53KEBRPWHNU2PRPQDQCA2GXANCNFSM4IH37DHQ.

murabye commented 5 years ago

Снимок экрана 2019-08-07 в 12 45 35 here is it. I can't remove strings from "inferredMetricsTieBreakers". I tried to select one (or both) of version and then delete

DanPristupov commented 5 years ago

Thank you for the screenshot. We need a way to select none somehow.

murabye commented 5 years ago

Thank you! Do I need to add a feature request tag to the topic?