search

primaeval / script.tvguide.fullscreen

tv guide fullscreen
GNU General Public License v2.0
25 stars 26 forks source link

Dark skin fixes #6

Closed iainsmacleod closed 8 years ago

iainsmacleod commented 8 years ago

Got OSD information working again.

primaeval commented 8 years ago

There are a few conflicts so you'll have to merge in my master first and fix the differences.

iainsmacleod commented 8 years ago

Hmmm, when I look at my GitHub app it says that master is up to date with primaeval/master? Any ideas?

primaeval commented 8 years ago

It should say you are ahead of me. Check you have fetched from upstream and merged from the tracking branch.

iainsmacleod commented 8 years ago

I keep trying to sync but it doesn't appear to be working. I think I have royally messed something up. last changes I see from you are 0.0.60

iainsmacleod commented 8 years ago

Did I mess somethingup with this https://github.com/iainsmacleod/script.tvguide.fullscreen/commit/cb6eb3db4d0fe46627c6f0711a83a577572216b5 ?

primaeval commented 8 years ago

I can't really see what is wrong. It might be.

iainsmacleod commented 8 years ago

DO you know how I can blow mine away and overwrite with yours? I have my changes saved, so should be easy to merge, but I am in a crappy position right now.

iainsmacleod commented 8 years ago

I'm sorry to be so much trouble.

primaeval commented 8 years ago

Save your work folder somewhere else before you start experimenting! You can do hard resets to your branches to get them back in sync.

primaeval commented 8 years ago

It doesn't look like you have pulled in my changes since you made a fork. This might help. http://stackoverflow.com/questions/7244321/how-do-i-update-a-github-forked-repository

primaeval commented 8 years ago

This is the main part: https://help.github.com/articles/syncing-a-fork/

primaeval commented 8 years ago

Have a look at this diagram to see what is going on: https://github.com/primaeval/script.tvguide.fullscreen/network

iainsmacleod commented 8 years ago

Thanks for all the info, will give it a read.

On Aug 15, 2016 5:38 PM, "primaeval" notifications@github.com wrote:

Have a look at this diagram to see what is going on: https://github.com/primaeval/script.tvguide.fullscreen/network

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/primaeval/script.tvguide.fullscreen/pull/6#issuecomment-239937443, or mute the thread https://github.com/notifications/unsubscribe-auth/AEAHoowundS0rNfGXRQd1ptXZtbXcy9mks5qgNxugaJpZM4Jkwhw .

iainsmacleod commented 8 years ago

Chief, I have been reading this stuff and have tried several things - I have no idea how I can't get it to work. At this point I have my work saved, do you know how I can just totally overwrite my master with your original and then add my changes and do a pull request - it all sounds simple. Also, I guess when I add changes I publish to my master, then I ask for a pull from my master to yours?

On Mon, Aug 15, 2016 at 5:38 PM, primaeval notifications@github.com wrote:

Have a look at this diagram to see what is going on: https://github.com/primaeval/script.tvguide.fullscreen/network

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/primaeval/script.tvguide.fullscreen/pull/6#issuecomment-239937443, or mute the thread https://github.com/notifications/unsubscribe-auth/AEAHoowundS0rNfGXRQd1ptXZtbXcy9mks5qgNxugaJpZM4Jkwhw .