GitLane v2.6.2
Resolve all hands every conflicted file to your agent in one session, so related conflicts are resolved together, plus Review all no longer flickers when you stage.
Also in the docs: Merge conflicts
What's changed
Merge conflicts (#539):
- Changed: Resolve with AI and Resolve all now send every conflicted file to the agent in one session and one prompt, instead of one session per file, three at a time. The agent sees all the files together, so related conflicts are resolved consistently, and a merge with many files starts the agent only once.
- Changed: Each file still gets its own proposal in Output to review, apply or discard. A file the agent got wrong (missing, empty, still holding conflict markers, or changed on disk meanwhile) shows an error on its own, and the rest still land. You can stop one file or all of them.
- New: While the files are read, the banner says "Preparing files for agent…".
Changes (#541):
- Fixed: In Review all, ticking a file's checkbox no longer makes every other open diff flash "Loading diff…". Diffs stay on screen until their refreshed version arrives.
- Changed: Stage and include checkboxes are quieter: an unchecked box shows when you hover its row or focus it, and checked boxes use a soft accent tint.
How it works
GitLane reads the conflicted files, sends them to your agent as one prompt, and splits the answer back into one block per file. Each file is checked on its own before and after the agent runs, so one bad answer never holds up the others. Nothing touches your working tree until you apply a proposal.
Good to know
A request is capped at about 600 KB of files. A larger set is refused before anything is sent, so resolve it in smaller batches. The whole sweep shares one 5-minute agent turn, and proposals land when that turn ends.
Walkthrough: Ask an agent to resolve a text conflict.
Installers: Download GitLane.