Firacode: Proposal: Add support for git conflicted file syntaxes

Created on 6 Nov 2018  路  8Comments  路  Source: tonsky/FiraCode

<<<<<<<, =======, and >>>>>>> are used as a syntax in conflit files on git.

Example

class Viewer
{
    public string Font =>
<<<<<<< HEAD:src/Viewer.cs
        "Fira Code";
=======
        "Fira Mono";
>>>>>>> base-branch:src/Viewer.cs
}
suggestion
Source
picture acid-chicken
👍6

Most helpful comment

I like 2 and 4 personally, but wouldn't be upset with any of them.

picture mattgrande on 7 Nov 2018
❤4 👍3

All 8 comments

Any suggestion how those might look?

tonsky picture tonsky on 6 Nov 2018
😄2

Here are my proposals.
image
image

acid-chicken picture acid-chicken on 7 Nov 2018

I like proposals 3 and 2

Quentinix picture Quentinix on 7 Nov 2018
❤2

+1 for 3

ttyS0 picture ttyS0 on 7 Nov 2018
❤7

I like 2 and 4 personally, but wouldn't be upset with any of them.

mattgrande picture mattgrande on 7 Nov 2018
❤4 👍3

I like 2 and 4

Yunkou picture Yunkou on 8 Nov 2018
❤3

Only problem I see would be a conflict with markdown?

Header!
=======
miniBill picture miniBill on 31 Dec 2018
👍1

@miniBill Yes, you are right.
However, the same applies to == and ===.

H1
==

H1!
===
acid-chicken picture acid-chicken on 31 Dec 2018
👍1
Was this page helpful?
0 / 5 - 0 ratings

Related issues

Photonico picture Photonico  路  3Comments
blucell picture blucell  路  4Comments
whatisaphone picture whatisaphone  路  3Comments
Igorgro picture Igorgro  路  3Comments
mlajtos picture mlajtos  路  4Comments