Hi I'm in the same situation. I know the best approach is using git efficiently, which I am not doing. I've got my project under Subversion. So I use WinMerge and it's going well. This approach lets you look carefuly at the code while you're doing your merges.
If you're using git I'm sure people will come with suggestions. Cheers, Thomas murali a écrit : > Hi, > > Our site is built on a Insoshi fork from the pre-rails2.1 days. I > would like to merge in the new changes like search, groups etc one by > one to mitigate the conflict issues. Our UI has deviated a lot from > Insoshi and hence the conflict concern. > > What is the best approach to merge in only the search changes? And > then the group changes? > > Thanks. > > > --~--~---------~--~----~------------~-------~--~----~ Insoshi developer site: http://dogfood.insoshi.com/ Insoshi documentation: http://docs.insoshi.com/ You received this message because you are subscribed to the Google Groups "Insoshi" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/insoshi?hl=en -~----------~----~----~----~------~----~------~--~---
