Replies: 58 comments 108 replies
-
|
Xcode does a similar thing, and allows jumping from one change to the next with the up and down arrows, by clicking the divider between the views. |
Beta Was this translation helpful? Give feedback.
-
|
I've been trying the current implementation for weeks, but I haven't found it to be more useful or clearer than the VS Code version, especially for comparing staged files and resolving Git conflicts. Have you considered opening an issue? I wasn't able to find one. |
Beta Was this translation helpful? Give feedback.
-
|
I'd vote for this too. Having just come across Zed I think it looks great, but the diff view pales in comparison with the side-by-side that I'm used to in IntelliJ. |
Beta Was this translation helpful? Give feedback.
-
|
This feature would be a great addition. Coming from VSCode, this is something that I miss a lot... |
Beta Was this translation helpful? Give feedback.
-
|
This is one of the most important features for me |
Beta Was this translation helpful? Give feedback.
-
|
Just copy-paste IntelliJ implementation, it's the best out there. |
Beta Was this translation helpful? Give feedback.
-
|
I think this is a duplicate with this #4523 |
Beta Was this translation helpful? Give feedback.
-
|
Yup this is my number one missing feature. The over and above git view is really hard to get the context of the changes particular if they are more extensive. A side by side diff view where you can easily see the new file vs the old file (with changes highlighted) is so much easier to read. (It also works better when working with LLM's too as it's easier to copy past new and old files... to put into an llm). |
Beta Was this translation helpful? Give feedback.
-
|
bumping this as i just switched to zed and this is currently one of my main struggles |
Beta Was this translation helpful? Give feedback.
-
|
Also, add a panel that allows to choose what to compare with:
see #31961 |
Beta Was this translation helpful? Give feedback.
-
|
It would be very helpful to support the option of Ignore Trim Whitespace. (seen in VS Code under Settings > Text Editor > Diff Editor) |
Beta Was this translation helpful? Give feedback.
-
|
Same here: Not having a side by side view for git changes is the one feature I am missing to fully switch over to Zed. |
Beta Was this translation helpful? Give feedback.
-
|
I am alsao having this issue. Especially I do not want to make the agent changes and then bulk view but I want to stay in 'ask' mode and then 'generate' a diff per 'parts' I copy into the editor and inspect the diff. |
Beta Was this translation helpful? Give feedback.
-
|
yeah i feels like i get used to so much seeing the diff side by side in vs code. a little bit trouble viewing it vertically. of course a skill issue though. |
Beta Was this translation helpful? Give feedback.
-
|
Is it possible to use an external pager with Zed? While waiting for a built-in, https://github.com/dandavison/delta does a good side-by-side diff presentation. |
Beta Was this translation helpful? Give feedback.
-
|
OMG, this looks awesome |
Beta Was this translation helpful? Give feedback.
-
|
Jetbrains Git Diff is the best. My teammates are having a hard time resolving conflicts using VSCode/Cursor diff while it doesn't take me 10 seconds to resolve it cause the changes are very easy to spot. Plus the magic button is goated. If it can be brought over to Zed, i'll definitely switch over. haha |
Beta Was this translation helpful? Give feedback.
-
|
The only reason why I haven't switched to it over WebStorm, I love how snappy Zed is. |
Beta Was this translation helpful? Give feedback.
-
🤯
Thank me for my sacrifice 😅
|
Beta Was this translation helpful? Give feedback.
-
|
The side-by-side diff is truly the most effective way to resolve conflicts currently. Please speed up the release a bit. |
Beta Was this translation helpful? Give feedback.
-
"That day" was not the day, but I have an excuse 😉 But TODAY, I have a solution 😁 Let's finish this intro, together |
Beta Was this translation helpful? Give feedback.
-
|
I created a cli to show a split diff view in Zed using a task and a keymap. It looks very close to the GitHub desktop diff viewer, with split diff support and word highlights // ~/.config/zed/tasks.json
[
{
"label": "Critique",
"command": "bunx critique --watch",
"shell": {
"program": "sh"
},
"hide": "on_success",
"reveal_target": "center",
"show_summary": false,
"show_command": false,
"allow_concurrent_runs": false,
"reveal": "always",
"use_new_terminal": true
}
]
// ~/.config/zed/keymap.json
{
"bindings": {
"cmd-shift-g": [
"task::Spawn",
{ "task_name": "Critique", "reveal_target": "center" }
]
}
}
|
Beta Was this translation helpful? Give feedback.
-
Beta Was this translation helpful? Give feedback.
-
|
ok making big changes with agent and this top down gif is really annoying lol. Need some intellij git diff to properly review agent work @LivioGama get well soon |
Beta Was this translation helpful? Give feedback.
-
|
I unfortunately have to disappear for 1 month for this once in a life time japan trip. @somtooo you seem to be the natural candidate and advocate to take over the topic in the PR and maybe with @maxbrunsfeld you can move things on. At least in term of decisions and scope discussion. Otherwise take care everyone and I'll see you soon! |
Beta Was this translation helpful? Give feedback.
-
|
I had some time today to explore curved connectors and how hunks can be staged or reverted. Since there is quite a debate between both concepts, I'm thinking about how user research could help inform the decision. I'll need more time to think about it though. I'm curious to hear what you all think. |
Beta Was this translation helpful? Give feedback.
-
|
I have one question for intellij users. With the curved connector approach, how do you deal with diffs with large insertions? doesn't that make it hard to compare side by side, given that the code in each version is now at completely different places? Do you just switch to the unified view in that case? But what if parts of the code are better examined with the unified view, and parts are more appropriate for side by side. Once you're past the large insertions, you can no longer compare side by side with the intellij approach for the rest of the file, right? Or am I missing something? |
Beta Was this translation helpful? Give feedback.
-
|
Maybe one could optimize for "speed of execution" and then potentially
'generalize / theme it '?
Presumably, most of us at this point want some feature of this sort and are
then looking forward for any form of *evolution*.
…On Fri, Oct 24, 2025 at 12:04 PM Somtoo Chukwurah ***@***.***> wrote:
You keep saying majority but most people agree intellij has the best
diffs, not GitHub and not vscode
—
Reply to this email directly, view it on GitHub
<#26770 (reply in thread)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/BQPHSL2UG2UKAXMDMFXSF2T3ZH2SDAVCNFSM6AAAAABZAMRUSSVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTINZXGEZTCMI>
.
You are receiving this because you commented.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
|
I've migrated 90% of my coding work from JetBrains to Zed, but when we have a lot of commits and merges with many conflicts, I have to go back to JetBrains to reopen the project. |
Beta Was this translation helpful? Give feedback.
-
|
Is there any update on this? |
Beta Was this translation helpful? Give feedback.












Uh oh!
There was an error while loading. Please reload this page.
-
It would be nice to see changes side-by-side instead of vertically, with differences highlighted. For example, if I change a variable name from addtwonumbers to addTwoNumbers, the T and the N would be highlighted.
VS Code does something similar, and I think it provides a very easy viewing experience. As with vim, you could switch from the left buffer and right buffer with ctrl-w-h and ctrl-w-l.
The highlighting isn't that clear with vs code, but the side-by-side view is very nice to see. It means I can edit code in the git diff viewer, and see the changes to the original code in real time.
Beta Was this translation helpful? Give feedback.
All reactions