XF 1.5 How do I merge the changes made in local server to production site?

[Blast]

Is there a guide I can follow so I can easily merge the changes I have done to the style, admincp, etc from my local server to the production site?

 

[Paul B]

You can export and import the style, but you can't do the same with option settings.

 

[Blast]

You can export and import the style, but you can't do the same with option settings.

Is it possible if I just import the latest SQL from PhpMyAdmin and then merge it with the existing one? And then overwrite the existing site files with the one from the local server?

 

[Paul B]

Importing the database will overwrite the existing database - it isn't possible to merge databases.

 

[Petros]

Am not sure for this but you must test first,i have made this on wordpress.
Find the correct sql export it and upload it where you want to apply the changes,if needed overwide.

Example,if you have made changes to add-on export addon sql and upload it,this should work.
However you must test before you do this to live site