Solving the .resx Merge Problem

Tom Clement

Rate me:

4.88/5 (31 votes)

17 Jul 2014CPOL4 min read

116.2K

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.

Alternatives

Members may post updates or alternatives to this current article in order to show different approaches or add new features.

1. Solving the .resx Merge Problem in TFS

6 Sep 2013Magnus_

This is an alternative for "Solving the .resx Merge Problem "

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

Alternatives

License

Comments and Discussions