Merging Add Ons

[Renz]

Howdy....
In need of assistance, I think I have just got out of my depth..I have succesfully added mods etc to my new site however..eeek one of the Mods is CAPTCHA and a new mod I wish to do is how did you hear about us....well quite a few of the files cross over so to speak and I need to use winmerge to make the differences over.The problem is I don't know how to drive it...
I am a quick learner so an easy to follow example of merging a file would just be awesome and I can take it from there..+ any tips are welcome.
Many Thank
Regards
Renz
Current Cart 138a
Wanting to merge the following
Mod > Captcha captcha_ttf_and_HideShowPhoneOnSignup

http://www.zen-cart.com/index.php?ma...roducts_id=893

Mod > how_did_you_hear_about_us_1.3.8.a

http://www.zen-cart.com/index.php?ma...roducts_id=186

[schoolboy]

In winmerge, choose OPEN from the FILE menu.

This will bring up two input path fields, so in the FIRST field yoiu navigate to the first file (of the given name). In the SECOND field, you navigate to its similarly-named counterpart.

In your case, you will want the file from the CAPTCHA mod in field one, and its similarly-named counterpart from the HOW DID YOU HEAR ABOUT US mod.

Then click OK.

This will bring up an edit screen comprising TWO panes.

In the first, will be the code for the FIRST file.

In the second, will be the code for the SECOND file.

All areas highlighted - probably in YELLOW - will be code differences that winmerge has detected.

You now need to know what PARTS of the code to "move" or "overwrite" from the one file to the other. Sometimes this is pretty obvious, but at other times it can be confusing!

There are several edit tools in the winmerge menu bar that help you move stuff from one file to the other.

Consider your first attempt as being a TUTORIAL. Try all winmerge's features. When you feel more confident, perform your surgery on your real shop.

Rule One: make backup copies...

[Renz]

Hi There,

Thanks for your initial help, tried all that and can now move stuff across....as the captcha is the first mod then I have to merge the how did you hear about us over.
The problem is as I wonder down and navigate to next difference and it changes to pink etc..I am not entirely sure what I am bringing across and is it over writing what is already there and required..
Basically I am at the confusing part you mentioned and cant seem to figure out...there are a few files only but quite a few changes on them..I have l made back ups.Like a good pupil...
And wait for further advice.
Thanks a Million

[Green333]

Hi
I was wondering if you ever found a solution to your query?

I have exactly the same problem with the same 2 mods, and personally "lack of knowledge/confidence" with winmerge

Any advice most appreciated

Thanks in advance

Green333

[Renz]

Hi Green333,

I just opened up winmerge and copied all the how did you hear about us differences to the captcha uploaded and works fine....

PS back up back up......just in case

Regards
RR

[Green333]

Many thanks, Renz!
I feel much more optimistic now - will give it a go

Have a great day

[Renz]

I am happy to hear that, it a pretty easy merge if I remember correctly it should be just these files, however please keep a copy of the originals and then you can put them back should you have an issue.

Come back and let us know how you went, and what you did...it's great confidence for new mergers....I was never able to find a good step by step article on merging for beginners...

Cheers
Renz

how_did_you_hear_about_us_1.3.8.a
shop\includes\modules\create_account.php

how_did_you_hear_about_us_1.3.8.a
shop\includes\templates\your template\templates\tpl_modules_create_account

-----------------------------------------------------------------------------------------

captcha_ttf_and_HideShowPhoneOnSignup
shop\includes\modules\your template\create_account.php

captcha_ttf_and_HideShowPhoneOnSignup
shop\includes\templates\your template\templates\tpl_modules_create_account....

---------------------------------------------------------------------------