Is there a way to avoid some part of a file to be ignored while merging branches,
i.e. config.ini (just invented), suppose that I can\'t make config.dev.ini, config.t
