Release /
Zed v0.229.0
Ask the agent to resolve merge conflicts.
Before you upgrade to v0.229.0
1 to fixWhat 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.
Read the evidence
1M-token context for Claude Opus and Sonnet with your own key; Gemini 3 Pro Preview settings move to Gemini 3.1 Pro automatically.
Uncommitted change badge and file icons in the Git panel; rename and delete worktrees over SSH.
Seeded by @iluxav with Claude Code (canido), from the release's public sources. Each change links to its evidence.