wasyl
02/10/2023, 11:41 AMgit diff
in terminal shows much more useful diff than IJ, even though it’s much easier to revert chunks in IJ 😕 Is there an option to use the diff generated by local git
installation?christophsturm
02/10/2023, 12:17 PMwasyl
02/10/2023, 12:24 PMI do all my merges manually by scrolling through the file and removing the conflict markers.Same here, but I think I just don’t grok how merging tools in general should be used. Seems much faster to e.g. remove all the conflict markers from imports and let IJ sort them out itself
christophsturm
02/10/2023, 12:26 PMchristophsturm
02/10/2023, 2:25 PMMarit van Dijk
02/10/2023, 2:48 PMchristophsturm
02/10/2023, 3:26 PM