GitLens Files

Added

• Introduces AI-powered conflict resolution (Preview) — a new Resolve mode in the Commit Graph WIP details panel that uses AI to resolve merge, rebase, and cherry-pick conflicts (#5306)
• Resolves conflicted files in parallel with streamed progress, proposing a per-file resolution (merged, kept current, took incoming, deleted, or flagged as needs review) that you review as a diff before anything is applied
• Adds the ability to refine the whole run with a prompt, give per-file feedback to re-resolve a single file, and apply or discard the proposed resolutions
• Adds entry points across GitLens: a Resolve action on the WIP details header and the paused-operation banner, Commit Graph context menus and WIP row buttons (all conflicts or selected files), the Resolve Conflicts with AI Command Palette command, and a Resolve Conflict with AI action on individual conflicted files in the sidebar views
• Adds clickable file links in the resolve panel that open a conflicted working-tree file so you can inspect it before resolving

Changed

• Changes the working changes (WIP) details header to lead with the Resolve action when conflicts are present, ahead of Compose, Review, and Compare
• Updates the design and readbility of the Pro feature gates (e.g. Commit Graph, Visual History) — with an optional Switch Repos action to move to a repository where the feature is available (#5335)
• Improves the AI weekly usage-limit message with a Get More Credits action to purchase additional AI credits for users who can buy credits, or guidance to contact an org admin for those who can't (#5298)