How to Merge Running Production Code(on server) into Updated Development Git Repository
I am facing a issue because of my own bad approach for deployment . But I want to overcome from this problem. Problem is
I uploaded my local rails application on digital ocean ( 1 click installation ubuntu 14 + unicorn + nginx ) and any how i deployed it and it is now running . But during deployment I did various changes in code to make the application run .
But during this period , we carry on development on my local machine and maintained it into github . Now i have to merge the recent local code ( which is in git ) into production server .
Is there any straight forward way .
Thanks in Advanced