Hi Igor,
Am 29.01.2012 um 00:11 schrieb Igor Stasenko <siguctua@gmail.com>:
now try to merge it with your "magical" SCM which can resolve such
kind of conflicts.
no tool can ever replace communication. Regardless of programming language used.
Best,
Michael
