Merge Studio — Merge Conflict Resolver & 3-Way Merge Editor

Manifest

Metadata

Namespace

gitstudio

Name

merge-studio

License

MIT AND Apache-2.0

Homepage

https://gitstudio.dev/merge-studio

Repository

https://github.com/GitStudioHQ/merge-studio.git

Reviews

0

Taxonomy

Categories

Description

Resolve Git merge and rebase conflicts in a JetBrains-style three-pane editor, with a conflicts dashboard, colour-coded changes, full undo and a side-by-side diff.