osfeed.dev
Projects/Zed/v0.229.0
Release /

Zed v0.229.0

Ask the agent to resolve merge conflicts.

Before you upgrade to v0.229.0

1 to fix

edit_prediction_conflict became edit_prediction && (showing_completions || in_leading_whitespace); keymaps migrate automatically but break if they relied on the two being exclusive. Tab in leading whitespace now accepts the prediction.

Action requiredGet multi-line edit predictions as you type and accept them with Tab.Affects: Keymaps that use the edit_prediction or edit_prediction_conflict key contexts
Read the evidence

What changed in v0.229.0

Agent merge-conflict resolution, @-mention of the branch diff, 1M-token context for Claude Opus and Sonnet with your own key, Git panel change count badge and file icons, worktree rename and delete over SSH. Gemini 3 Pro Preview configurations migrate to Gemini 3.1 Pro. Covers v0.228 and v0.229.

Also: Align multiple cursors, pinch-to-zoom in the image viewer, easier unbinding of default keys.

Stable v0.229.0.

Fixed and improved

Resolves merge conflicts on request and accepts the branch diff as @-mentioned context.

ImprovedAsk an AI agent in the editor to read, edit and run commands across your project, and review its changes.
Read the evidence

Seeded by @iluxav with Claude Code (canido), from the release's public sources. Each change links to its evidence.