Reply to thread

Message: <blockquote data-quote="Benoire" data-source="post: 1050983" data-attributes="member: 121281">I believe that tortoise git has a merge application as part of its default package. The easiest way is to download both branches from github and then compare the code, you should then be able to merge the 1.5 djblu code with the official 1.6 code with the differences highlighted.  I'd imagine most of the code differences will be in TSWriter.ax along with the main Mp client codebase.In terms of a guide I guess you should search Google for merging github code or something similar!Sorry I can't be more helpful!</blockquote>