Recursively compare content of two directories

Command line

This requires the diff and vim packages.

diff --recursive /dir/ect/ory1 /dir/ect/ory2 > 1_vs_2.diff
vimdiff 1_vs_2.diff

Potentially useful diff options:

--ignore-all-space
--exclude=.svn

GUI

Install Intellij CE.

Then either Run IntelliJ Diff from the command-line.

Or from within a running Intellij window:

Open a common parent directory as a project
Select the two directories to compare
Right-click – Compare Directories

Alternatives

I often see the GPL-licensed WinMerge tool recommended, But it works only on Windows, last release was 2013 and navigation into sub-directories and file diffs is a bit clunkier than in Intellij.

Java software engineering – reference resources

My first ~/.vimrc

I recently progressed from “the little vim-avoider who would if he only could” level to someone who actually edits his ~/.vimrc sometimes. So now I don’t want to forget the little I have learned and post it here:

" pointless reminder how i fixed vim issues on cygwin 
" existence of ~/.vimrc already triggers nocompatible mode
set nocompatible

" highlight all search pattern matches
set hlsearch

" i use light or even white background, vim to use readable colors
set bg=light

" use syntax highlighting
syntax on

M	T	W	T	F	S	S
1	2	3	4	5	6	7
8	9	10	11	12	13	14
15	16	17	18	19	20	21
22	23	24	25	26	27	28
29	30	31

Official Java and JEE

Java community

JEE and Java web servers

Build and test automation

Source and version control

Java IDEs