tonsky / tonsky/FiraCode

Proposal: Add support for git conflicted file syntaxes

Open
#676 8 comments 6 reactions 0 assignees View on GitHub

Nobody has claimed this yet.

suggestion
Dominant language
Clojure
Stars
82k
Forks
3.2k
PR merge metrics
No merged PRs in 30d

Description

<<<<<<<, =======, 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
}

Contributor guide

No contributing guide indexed for this repository

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

Research direction

Start by locating FiraCode’s ligature definitions and existing handling of operator sequences; the issue names no file or test. Use the conflict-marker example as the acceptance case, and consider the work done when the three Git marker sequences receive the intended syntax support.

Written by the indexing model from the issue text.

Assessment

Tech stack
git
Domain
devtools
Issue type
Feature
Difficulty
4/5
Estimated time
3-5 days
Activity status
Stale
Clarity
Mostly clear
Newbie friendliness
35/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.