I have taken the tactic of picking both entries and then end up with duplice entries. I can also lose an entry if I pick only one of the two entries. I've gotten entire duplicates of entries.įor instance in the above,if I don't merge it correctly, I can have an extra '' before the entries, and a missing one afterwards.An other problem is I've had comments show up merged into the wrong entry.I've also had instances where I had missing '' tags.I've had instances where I had extra '' tags.If I'm not careful when merging this, I can end up with any number of problems resulting a corrupt resX file: Another reason is that the merge tool is treating the resX file as a text file and merging it line by line.
FILE MERGE TOOL CODE
One of the reasons for this is not every item has a comment - so the line entries get mismatched from one branch of the code to the next. Note how the line that is conflicting is '' versus ''. Now instead of dealing with 500 merge conflicts, I quickly deal with about 10 - and it takes less than a minute to pick which ones I want to keep and get rid of the bad entries.Īn example of a merge conflict is the attached image: I've used it for the last couple of builds and it works great and quickly on nearly 12,000 entries (4,000 entries per file).
I went from about 500 'merge conflicts' (where the merge tool didn't know which line to use and needed human input) to about 3,500 merge conflicts (this was from a ResX file that has grown to about 4,000 entries).įinding no good alternatives to my growing problem, and I didn't want to try and figure out a different localization scheme, I instead elected to develop my own ResX merge tool. I tried this - it actually made my problem far worse. One solution I found recommended loading each ResX file, sorting it by key, spitting it out sorted, then having the various merge tools compare and merge the sorted ResX files. The problem I was finding was that all the various merge tools treated ResX files as straight text files and tried to do line by line merging, instead of entry by entry merging. The problem has only gotten worse over time to the point where I was spending more time dealing with merging this one file over everything else in the build process combined. Whenever I do a build merging various branches from other developers on this project, I spend more and more time dealing with our primary ResX file and getting it to merge correctly. I use ResX files (with no code generation) to store/retrieve localized strings. It loads them in using a ResXResourceReader, then compares and merges into a single ResX file using a ResXResourceWriter. Instead of merging ResX files by treating them as text files, which the various merge tools I've tried do, this tool instead treats the ResX files as ResX files.
0 kommentar(er)
