In the new 2020.1 version, how can you see the files that differ between two Git branches?
I just upgraded to 2020.1 this morning. Previously, I could select a different Git branch from the bottom-right, and click "Compare with local" (or something similar). This gave me a very friendly dialog box, where I could see exactly which files differ between the two branches, and quickly view a diff on each file.
Now, that option seems gone. There is a "Compare with current" option, but it shows me the list of GIT COMMITS that differ between the two branches. I can only click on each commit, and compare each file's content to my local workspace or to the prior commit. Which just isn't very helpful at all for a compare-branch-with-current-branch use case.
Does this functionality still exist, just hidden somewhere else in the UI? How can one compare the actual file contents of two separate Git branches?
请先登录再写评论。
Ahh... I think I just answered my own question. Apparently, this functionality was moved to the "Show Diff With Working Tree" context menu item.
Thank you Stevedperkins I was missing it for weeks!
> I can only click on each commit and compare each file's content to my local workspace or to the prior commit
It is also possible to call Compare with Local on any commit (not files view) in the new Compare view to get a file-wise diff between the selected revision and working tree.
Dmitriy Smirnov is it possible to get the diff to display in the pane that lists the files? In other words, it would be nice if clicking a file loads and displays the diff to the right of the file list instead of having to double click the file and see the diff in a new pane (that overlaps the file list).
Displaying the diff next to the file list will make the review process much quicker for me as I won't have to open and close panes (all the time).
Check "Show diff preview" layout option:
Hi, thx for quick reply. I've found that one and use it all the time. Super handy!
I'm referring to the screen you get when executing `Show Diff with Working Tree`. It would be super useful to see the diff of each file to the right of the file's list, see below.
Use case: review someone's completed feature before merging it. Or is there another flow in PyCharm that is better suited for this?
Here is the feature request for that: https://youtrack.jetbrains.com/issue/IDEA-231225
Feel free to vote and follow.
Thx, I voted and followed!