Click here to Skip to main content
Click here to Skip to main content
Articles » Languages » C# » Windows Forms » Revisions
 
Add your own
alternative version

Solving the .resx Merge Problem

, 17 Jul 2014 CPOL
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.

Revisions


  

Compare Revision Minor Date Status Editor
8 - publicly available No 18-Jul-14 11:14 Available Tom Clement
Updates in content. Changes: 76
7 No 17-Jul-14 22:31 Available Tom Clement
Added stdin/out functionality so this can be used as a pipe.
6 No 10-Jul-14 1:54 Available Tom Clement
Updates in content. Changes: 16
5 No 9-Jul-14 21:47 Available Tom Clement
Updates in content. Changes: 2
4 No 21-Jun-09 8:41 Available Smitha Vijayan
3 No 21-Jun-09 8:54 Composing Deeksha Shenoy
2 No 18-Jun-09 14:43 Composing Deeksha Shenoy
1 No 5-Jun-09 14:06 Composing Deeksha Shenoy

License

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

Share

About the Author

Tom Clement
Team Leader
United States United States
I've been programming in C, C++, Visual Basic and C# for almost 30 years. I've worked at Sierra Systems, ViewStar, Mosaix, Lucent, Avaya, Avinon, Apptero and now Serena in various roles over my career.

| Advertise | Privacy | Terms of Use | Mobile
Web03 | 2.8.141220.1 | Last Updated 17 Jul 2014
Article Copyright 2009 by Tom Clement
Everything else Copyright © CodeProject, 1999-2014
Layout: fixed | fluid