Merge conflict resolution just became a background job. gitlens' start auto-rebase, out september…
merge conflict resolution just became a background job. gitlens' start auto-rebase, out september 18, hands the pending rebase to ai conflict resolution before it starts and reports a rebase that never pauses as completed.
the conflict that never surfaces is the new definition of done.
Context
The GitLens release notes, last updated September 2026, say GitLens 19.1 of Tuesday 1 September 2026 gave the Rebase Editor a Start Auto-Rebase button that hands the pending rebase to automatic AI conflict resolution before it starts, and that a rebase that finishes without ever pausing is reported as completed and not cancelled. Edit and break steps hand back to you, a reword or squash opens for you to write the message, and Resume with AI and Abort Rebase stay available. GitKraken's AI page says AI Auto Rebase is a Pro feature that resolves a conflict only when its confidence meets the threshold you configure, pausing below it, with a summary sheet and full undo.
The dated release entry puts the feature in 19.1 on 1 September, and no 18 September entry was read, so out September 18 is unverified. The conflict that never surfaces is a gloss: the AI resolves above a configured confidence threshold, pauses below it, and some steps still stop for the user. It is a paid-tier feature using GitKraken AI usage, and no accuracy or correctness results were read. It works at local rebase level, where VS Code's Agent Merge works at pull-request level. That the conflict that never surfaces is the new definition of done is the author's opinion.
Related work
- Earlier note on VS Code Agent Merge ↗Pull-request level conflict resolution.
Watch next
- Error and undo rates and the default confidence threshold.
Sources
- GitLens release notes (GitKraken)help.gitkraken.com
- GitKraken AI (GitKraken Help)help.gitkraken.com
Provenance
The note above is reproduced unedited from the original post, first published on Threads on 20 September 2026 at 12:46 IST. Sources are the papers and datasets the note draws on.
View the original post ↗Embed this note
More notes
The air is now being asked to keep its own ledger
the air is now being asked to keep its own ledger: ecmwf’s aifs compo becomes the first ai model to forecast atmospheric composition globally every three hours, cleanair simulates 365 days of pm2.5 over china in ten seconds, and a unified framework maps six pollutants at one kilometer across the whole country. the air now files its own composition report.
read the note →The current is now being asked to draw its own map
the current is now being asked to draw its own map: china’s langya 2.0 predicts six ocean phenomena including internal waves and mesoscale eddies, a deep net called wenhai resolves eddies globally with air sea flux formulas built in, and scripps infers surface currents from the way temperature patterns deform in satellite images. the ocean now files its own circulation report.
read the note →The soil is now being asked to report its own carbon
the soil is now being asked to report its own carbon: a nix color sensor paired with generative data augmentation predicts soil organic carbon without a lab, random forest drives 74 percent of soil health mapping studies, and sentinel 2 tracks five year carbon change across france and italy from 922 samples. the dirt now files its own carbon account.
read the note →