Highlight the conflict block including markers (`<<<<<<<`, `=======`, `>>>>>>>`)
Select the conflicting code block in GitHub's web editor, GitLab diff viewer, or terminal output.
How to resolve Git merge conflicts and rebase failures on GitHub.
Highlight multi-way Git conflict markers (<<<<<<< HEAD) or rebase error logs on GitHub and understand which incoming changes to keep and which to discard.
Best fit
Best for developers reviewing complex merge conflicts in GitHub PR web editors or debugging interactive rebase failures.
On-screen walkthrough
How this looks on a real webpage.
Instead of switching tabs and rebuilding context, highlight the exact passage that slowed you down and press your shortcut (default: Ctrl+Shift+X or Cmd+Shift+X on macOS, fully customizable in settings).
1. Highlighted on page (GitHub Web Conflict Editor — Database Migration State)
<<<<<<< HEAD export const CURRENT_SCHEMA_VERSION = 42; export async function runMigrations(db: Database) { await db.execute('ALTER TABLE users ADD COLUMN avatar_url TEXT;'); ======= export const CURRENT_SCHEMA_VERSION = 43; export async function runMigrations(db: Database) { await db.execute('ALTER TABLE users ADD COLUMN phone_number TEXT;'); >>>>>>> feature/user-phone-auth
Ctrl+Shift+X“How do I resolve this migration version conflict cleanly without dropping either column?”
2. Vezz me on-screen answer overlay
**Both branches bumped `CURRENT_SCHEMA_VERSION` and added different columns to `users`**.
To keep both migrations:
1. Bump `CURRENT_SCHEMA_VERSION` to **`44`**.
2. Execute both `ALTER TABLE` statements in sequence:
```typescript
export const CURRENT_SCHEMA_VERSION = 44;
export async function runMigrations(db: Database) {
await db.execute('ALTER TABLE users ADD COLUMN avatar_url TEXT;');
await db.execute('ALTER TABLE users ADD COLUMN phone_number TEXT;');
}
```
3. Suggested follow-up questions in thread
- “How do we prevent migration version collision conflicts across team PRs?”
- “Explain the difference between `git merge` and `git rebase` for this PR.”
Step-by-step workflow
How to run this workflow in place.
Press your shortcut and ask what each branch intended to do
Vezz me separates what `HEAD` (the target branch) changed from what the incoming feature branch changed.
Request a merged snippet that preserves both intents
Ask Vezz me for the clean resolution code without any remaining conflict markers.
Key details
Why this approach works better than switching tabs.
Comparison Matrix
Resolving Git Merge Conflicts
Comparing in-page AI resolution with manual guessing.
| Method | Preserves Both Branch Intents | Speed on Web PR Editor |
|---|---|---|
| Vezz me on Conflict Block | Yes (understands semantic goal of both branches) | Instant (resolves right inside GitHub's conflict UI) |
| Accepting 'Ours' or 'Theirs' blindly | Fast resolution | Silently deletes one developer's feature work |
| Manual 3-way diffing in local IDE | Complete multi-file conflict sets | Requires pulling branches and running local git rebase loops |
Frequently asked questions
Common questions about git & version control.
Does Vezz me work in GitHub's online conflict editor?
Yes! Highlight any text in GitHub's web conflict resolver (`/pull/X/conflicts`) and press your shortcut (default: Ctrl+Shift+X).
Can it explain confusing git rebase terminal errors?
Yes. Highlight error output like `error: could not apply [commit]... fatal: rebase in progress` and ask Vezz me how to abort or continue cleanly.
Where can I read our guide to using Vezz me on GitHub?
See our complete guide: Vezz me on GitHub.
Related workflows & guides
Explore connected pages.
Ready to try this workflow on your own reading?
Install Vezz me free, highlight text on any webpage, and press your customizable shortcut (default: Ctrl+Shift+X or Cmd+Shift+X on Mac) to get an answer right beside the source.
