JSON: Add support for merge conflict markers #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

FichteFoll merged 1 commit into master from feat/diff-markers

Nov 21, 2025

Merged

JSON: Add support for merge conflict markers #416

JSON: Add support for merge conflict markers

Annotations

10 warnings

./Package/TextMate#L0

Syntax test filenames must begin with 'syntax_test_'

Syntax test filenames must begin with 'syntax_test_'

./Package/Sublime#L0

Syntax test filenames must begin with 'syntax_test_'

Syntax test filenames must begin with 'syntax_test_'

./Package/Sublime#L0

Syntax test filenames must begin with 'syntax_test_'

./Package/Property#L0

Syntax test filenames must begin with 'syntax_test_'

Syntax test filenames must begin with 'syntax_test_'

./Package/Sublime#L0

Syntax test filenames must begin with 'syntax_test_'

Syntax test filenames must begin with 'syntax_test_'

./Package/Sublime#L0

Syntax test filenames must begin with 'syntax_test_'

The logs for this run have expired and are no longer available.