During the work on #588 we noticed that Git ends up with merge conflict when it tries to merge files with adjacent lines changed.

Example:
Original file (master, feature-branch):

line 1
line 2

Changed file (master):

line 1 changed on master
line 2

Changed file (feature-branch):

line 1
line 2 changed on feature-branch

Now git merge feature-branch fails on merge conflict. It's a correct Git behavior (see e.g. here), however it's not so useful for INI where different line = different field (except multi-line string).

A solution is (probably) to write our merge driver for INI files. However, some research is needed.