Solving the .resx Merge Problem

Tom Clement

Rate me:

4.88/5 (31 votes)

17 Jul 2014CPOL4 min read

116.5K

3.3K

This article provides a console utility and a method for extending a merge tool to ensure that only real changes (not reordering) appear when merging files from different source control branches.

SortRESX.zip
- SortRESX.exe
SortRESX_source.zip
- SortRESX.sln
- SortRESX.v12.suo
- SortRESX
  - Program.cs
  - Properties
    - AssemblyInfo.cs
  - SortRESX.csproj

By viewing downloads associated with this article you agree to the Terms of Service and the article's licence.

If a file you wish to view isn't highlighted, and is a text file (not binary), please let us know and we'll add colourisation support for it.

License

This article, along with any associated source code and files, is licensed under The Code Project Open License (CPOL)

Written By

Tom Clement

Product Manager

United States

I've been programming in C, C++, Visual Basic and C# for over 35 years. I've worked at Sierra Systems, ViewStar, Mosaix, Lucent, Avaya, Avinon, Apptero, Serena and now Guidewire Software in various roles over my career.

Solving the .resx Merge Problem

License

Comments and Discussions