I am working on a project that has its code both in Dropbox and Github. The codebase in Dropbox is the most recent. I basically want to merge the codebase from Dropbox into the codebase in Github. Is there a simple way to do this?
Asked
Active
Viewed 27 times
0
-
Do you mean *merge*? – jonrsharpe Sep 15 '15 at 17:34
-
Yes, I meant merge. I have edited the above question. – GeekyGeek Sep 15 '15 at 17:56
-
And have you tried anything? What happened? – jonrsharpe Sep 15 '15 at 18:15
-
Yes, I did. I used KDiff to compare the two projects. However, Kdiff would show two files as different if they were not binary equals. So I had to manually click on each file to see if they were different in terms of text. This process was very time consuming. So was wondering if there was an efficient method. Any thoughts? – GeekyGeek Sep 15 '15 at 18:31
-
Why not just paste the code from Dropbox into your repo and see what Git thinks of it? – jonrsharpe Sep 15 '15 at 18:45
-
Thank you for your answer. I'll do so. – GeekyGeek Sep 23 '15 at 19:41