Open murabye opened 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.
here is it. I can't remove strings from "inferredMetricsTieBreakers". I tried to select one (or both) of version and then delete
Thank you for the screenshot. We need a way to select none
somehow.
Thank you! Do I need to add a feature request tag to the topic?
I have next conflict
and
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 :(