pvr.mythtv icon indicating copy to clipboard operation
pvr.mythtv copied to clipboard
verified publisher icon janbar

Simplify project merging

Open janbar opened this issue 9 years ago • 2 comments

@metaron-uk @b-pass

I have to change my development branch to simplify merging with kodi-pvr project. Last times I missed some fixes and it becomes complex to keep things synchronized. So I have to replace the old branch "doityourself" by a new default branch named "devel". This one is just a fork from the master where I add one commit on HEAD to make it standalone. That's allow you to create some changes directly on a fork of the branch master and then you can make a PR to my branch devel. Also you can use the branch devel if , like me, you prefer make the addon without need of kodi sources. But each time I have to sync with pulled changes in master , because a PR has been merged, I will rebase the branch devel on master and then push it force to keep the commit "make standalone" at HEAD. You should have to do only a rebase to keep the branch clean.

br

janbar avatar Dec 15 '16 20:12 janbar

The new branch devel-17 is a fork of Krypton with a special commit "make standalone".

janbar avatar Dec 15 '16 20:12 janbar

@b-pass , @metaron-uk Some news about the project: Since today project "kodi-pvr/pvr.mythtv" is deprecated and "janbar/pvr.mythtv" becomes the upstream to simplify our work. You can now open your PR against the branch "master" or "Krypton" in this repository.

janbar avatar Dec 19 '16 22:12 janbar