Closed emveepee closed 1 week ago
@ksooo @phunkyfish could you please review.
There is a merge commit that should not be there. Then two commits with the same name that doesn't make sense. Can you clean that up?
There is a merge commit that should not be there. Then two commits with the same name that doesn't make sense. Can you clean that up?
@phunkyfish yeah I couldn't figure out how to merge in those conflicted files that got changed twice after I started this. Can you help me out on how to do that?
I would just create a new branch and cherry pick the commits that you need. Then rename the branch and push it to the PR
I would just create a new branch and cherry pick the commits that you need. Then rename the branch and push it to the PR
Could I go back to my original approach noting I should have named commits differently, Hopefully the following changes are clearer.
The merge commit "Update to PVR API 9" should be renoved from this PR.
The merge commit "Update to PVR API 9" should be renoved from this PR.
@phunkyfish @ksooo I redid all the commits and was able to rebase correctly to remove this. I have one small change to make to change Channels.cpp back to the original filename on line 356 "/public/LiveStreams.xml"; and will do that after the changes are approved or if the review finds anything else.