2

I am using Visual Studio 2015 and have a project that is versioned locally using Git. When I double-click on a file in the Team Explorer window, a Diff editor opens.

From other IDEs (Eclipse, IntelliJ), I am used to managing my changes in these diff editors, like copying a chunk from the left to the right or the other way round. There is no middle bar that indicates such possible actions and no other clue.

So when I want to revert a chunk of code, I have to select it on the left side, copy it to the clipboard, select the corresponding text on the right side, paste the text from the clipboard. This feels very clumsy, since all I want to do is to "revert this one chunk".

Is there something I have overlooked?

Roland Illig
  • 40,703
  • 10
  • 88
  • 121

1 Answers1

4

The internal diff/merge tool in Visual Studio is extremely primitive and dreadful to work with. Luckily it supports external diff tools (except for code reviews due to commenting). So do yourself a favour and install KDiff3 and configure it as the tool to use. For version 2015 it is enough to just point it to the kdiff3.exe file, it will then automatically fill out the appropriate argument configuration.

hlovdal
  • 26,565
  • 10
  • 94
  • 165