Hi,
I did a merge for 1.8 for DJBlu's TV server plugin. I ended up doing a bit of work handling database version numbers (a bit more needs doing on that front) so that the installer would create the required extra fields when appropriate.
It's working fairly well, I created an installer and a few people have used it without too much issue.
What I'm thinking is 1.9 is on its way and i'm going to have to merge the new version I've created into 1.9. What's the easiest way to do this? Do I need to create a new branch on your git site (I'm very much a novice with git) or can I create a local branch from the current version I have on my dev machine and just merge that?
Any advice appreciated!
I did a merge for 1.8 for DJBlu's TV server plugin. I ended up doing a bit of work handling database version numbers (a bit more needs doing on that front) so that the installer would create the required extra fields when appropriate.
It's working fairly well, I created an installer and a few people have used it without too much issue.
What I'm thinking is 1.9 is on its way and i'm going to have to merge the new version I've created into 1.9. What's the easiest way to do this? Do I need to create a new branch on your git site (I'm very much a novice with git) or can I create a local branch from the current version I have on my dev machine and just merge that?
Any advice appreciated!