Hi, if two or more developers work on a project, they sometimes edit the same form. Git can't solve the changes and you have to do it by hand. Even it's better to use the form the other developer and add the changes again by hand. It's impossible to solve the conflict.
What do you do when you have this problem? Thank you for you time! Petr -- _______________________________________________ Lazarus mailing list [email protected] http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
