![]() ![]() Most of the times that dude it’s me, and if the conflict cannot be solved in a reasonable amount of time, I tend to discard the task and… well, that’s not parallel development, you know. Some of those tools change those XML files massively when a user change just a small property, so in the end the dude who integrates the changes get mad trying to solve the conflicts originated by that damned tool. Lots of development tools use XML files for saving configuration properties or share some information with other tools. I’m not thinking about documentation if someone can write a semantic merge tool for real text he or she probably would deserve the next Nobel Prize, for sure. Some of those systems provide a great branching mechanism, but the REAL problem about branching is not the branching process itself, but the merging process.Īnyway, some of us miss some kind of support for other file types. Plastic SCM provides lots of tools for merging correctly source code files, and that’s great, because not many Version Control Systems provide a good support for merging. ![]() ![]() resx files and ended up with a big headache because the conflict blocks are huge and you don't know how the result should be? The SortResX tool will solve your problem, find out how in the next lines. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |