@layerzerolabs/git-conflicts-parser

@layerzerolabs/git-conflicts-parser

This package provides a parser that can analyze and interpret content containing conflict markers generated by Git during the merging of two branches. It helps in identifying and resolving merge conflicts by parsing the conflicting sections of code.

Installation

You can install the package using either yarn or npm.

Using Yarn

yarn add @layerzerolabs/git-conflicts-parser

Using NPM

npm install @layerzerolabs/git-conflicts-parser

Usage

Below is an example of how to use the @layerzerolabs/git-conflicts-parser package to parse content with Git conflict markers.

Example

const parser = require("@layerzerolabs/git-conflicts-parser");

const EXAMPLE = `
This is some code
<<<<<<< HEAD
This is our change
=======
This is their change
>>>>>>> branch
More code here

This is another code
<<<<<<< HEAD
This is our second change
=======
This is their second change
>>>>>>> branch
More code here

This is another code
<<<<<<< HEAD
=======
This is their second change
>>>>>>> branch
More code here

This is another code
<<<<<<< HEAD
This is our second change
=======
>>>>>>> branch
More code here
More code here
`;

const result = parser.parse(EXAMPLE);

for (const block of result.blocks) {
  console.log(block);
}

In this example, the parser.parse function is used to parse a string containing Git conflict markers. The result contains blocks of code that represent the conflicting sections. You can iterate over these blocks to inspect or resolve the conflicts.