Developer & data · focused workspace

Git Conflict Resolution Workbench

Resolve pasted Git conflict blocks using the current side, incoming side or both, while retaining a per-block decision ledger.

Conflict decisionsEditable projectsLocal processing

Source → inspect → export

Open project

Preparing the worked example…

Your source & settings

Settings & options

Open your media file

Files stay in your browser. Try the built-in sample first.

Choose file

Source text is limited to 1.5 million characters per editor; imported text files are limited to 1.5 MB.

Inspect your result

PREVIEW & EXPORT

Output file

Know what changed

Handles standard and diff3 markers at the beginning of a line. Nested conflicts and malformed markers are rejected. This edits text only and does not modify a repository or execute Git.

Choose another output above or open Export files.

Explore the example

Resolve pasted Git conflict blocks using the current side, incoming side or both, while retaining a per-block decision ledger.

What you can inspect

Conflict decisions — Conflict, Start line, Current lines, Incoming lines, Base lines, Choice.

Keep the result you need

Use the output selector to inspect each generated file, then download it. Save a project to keep source inputs and settings together. Result files and editable projects serve different purposes.

Processing & file support

Source text is limited to 1.5 million characters per editor; imported text files are limited to 1.5 MB.

Your working session

Processing runs locally in a worker with a 30-second cancellation limit. Undo and redo keep up to 20 edits in this tab. Project files include imported assets and are limited to 40 MiB. There is no automatic saving.

Public pages include advertising and optional analytics under our privacy policy. Review the method and any flagged output before sharing files.

Using Git Conflict Resolution Workbench

Resolve pasted Git conflict blocks using the current side, incoming side or both, while retaining a per-block decision ledger.

Start with the worked example in conflicted text and per-block choices json · optional, then paste your own source or open a text file.
Adjust default choice. Change one setting at a time so you can understand its effect.
Choose “Resolve conflicts”. Inspect the conflict decisions before using the result.
Download the selected output, inspect other files in Export files and save a project if you want to reopen the same inputs.

Example

Try the built-in example, inspect conflict decisions and compare the result after changing one option.

Questions & answers

What does Git Conflict Resolution Workbench do?

Resolve pasted Git conflict blocks using the current side, incoming side or both, while retaining a per-block decision ledger.

What are the important limitations?

Handles standard and diff3 markers at the beginning of a line. Nested conflicts and malformed markers are rejected. This edits text only and does not modify a repository or execute Git.

Can I save and reopen my work?

Yes. Save a project JSON file containing your inputs, settings and any imported assets. Projects are limited to 40 MiB. Undo/redo stores up to 20 edits in this session and is not saved in the project. There is no automatic saving.

How do imports and output previews work?

Source text is limited to 1.5 million characters per editor; imported text files are limited to 1.5 MB. Text previews show up to 150,000 characters; downloads include the complete output. Tables show 50 rows per page; CSV files include all rows.