Merging code.

  • Thread starter Thread starter Mufasa
  • Start date Start date
M

Mufasa

Does anybody have any suggestions on how to merge to sets of code. I have a
website in C# that I had to split off a while to add functionality to one
and different functionality to the other. I didn't have them in version
control so I can't use that to compare them. I do have one version in
version control now.

Does anybody have any suggestions on how I can merge the two sets of code
together? Even if I had a file by file compare program that would at least
make it faster.

TIA - Jeff.
 
Does anybody have any suggestions on how I can merge the two sets of
code together? Even if I had a file by file compare program that would
at least make it faster.
Click to expand...

Being a Unix nut, I would use diff.

Do you have the baseline version when you split? Create a Version
control of that, check it in then check the first one in, merge the
second one and you have the changes and the conflicts.
 
Mufasa said:
Does anybody have any suggestions on how to merge to sets of code. I have
a website in C# that I had to split off a while to add functionality to
one and different functionality to the other. I didn't have them in
version control so I can't use that to compare them. I do have one version
in version control now.

Does anybody have any suggestions on how I can merge the two sets of code
together? Even if I had a file by file compare program that would at least
make it faster.

TIA - Jeff.
Click to expand...

Search around on the web for a file comparison application called WinDiff.

Tom Dacon
Dacon Software Consulting
 
Mufasa said:
Does anybody have any suggestions on how to merge to sets of code. I have a
website in C# that I had to split off a while to add functionality to one
and different functionality to the other. I didn't have them in version
control so I can't use that to compare them. I do have one version in
version control now.

Does anybody have any suggestions on how I can merge the two sets of code
together? Even if I had a file by file compare program that would at least
make it faster.
Click to expand...

Any high end editor will allow you to do file comparisons.

(I use jEdit but I am sure other can do the same)

But have you considered creating a branch and then putting
the other set of code in that branch and then let the
version control try to merge ?

Arne
 
Does anybody have any suggestions on how to merge to sets of code. I havea
website in C# that I had to split off a while to add functionality to one
and different functionality to the other. I didn't have them in version
control so I can't use that to compare them. I do have one version in
version control now.

Does anybody have any suggestions on how I can merge the two sets of code
together? Even if I had a file by file compare program that would at least
make it faster.
Click to expand...

Take your pick:

http://en.wikipedia.org/wiki/Comparison_of_file_comparison_tools

From personal experience: WinDiff comes with WinSDK, but is rather
bare-bones. TortoiseMerge and WinMerge are free and fairly popular on
Windows. Eclipse diff is quite good, too, but it doesn't have C#
syntax highlighting. And if you have a couple hundred $ to spare, then
Araxis Merge is the most convenient and powerful one out there (IMO).
 
Back
Top