Skip to content

Conversation

@gugahoi
Copy link
Collaborator

@gugahoi gugahoi commented Aug 30, 2011

Mainly updating script. Will have to change to check the master repo and not mine anymore. Should be a matter of only modifying a couple of line here and there.

@gugahoi
Copy link
Collaborator Author

gugahoi commented Aug 30, 2011

So, should I merge this? Git says it cannot be automatically merged and since it is a big big change I'm thinking of just replacing everything?

This would mean Mikie would have to redo his updates? But I believe it is easier adding his stuff than all of this. I don't even remember everything I've modified.

@DejaVu
Copy link
Collaborator

DejaVu commented Aug 30, 2011

This is the update script yes?

I would go for it and if it breaks bits, revert back. But I can't see why it would be a problem. Shame git does not explain why it cannot be merged.

@DejaVu DejaVu closed this Aug 30, 2011
@DejaVu DejaVu reopened this Aug 30, 2011
@MikeEsteves
Copy link

If you merge it on your local machine it will put arrows where there are conflicts and you can just re edit those files. But its chilled if you want to start over, I'll just add it manually. I quickly looked over the files and it seems that most of them are files I haven't edited at all so it shouldn't be too hard. I'll try do it a little later if I get the time

@MikeEsteves MikeEsteves reopened this Aug 30, 2011
@MikeEsteves
Copy link

My bad, pushed the wrong button!

@MikeEsteves
Copy link

  1. Don't forget about the mobile version of coming episodes, the fix breaks it so some functions need to be fixed there.
  2. What are the extensions to the placeholder files? Or is that just github saying its empty?
  3. What does it mean by file mode changed?

Other than that I've made all the changes to my repo I think

EDIT: Getting an AJAX error as soon as the update page loads? Its this function function ajaxRequest(params, id) Then the pwait images slows.Its not actually downloading tho. Any ideas? Also how does it know what the current version number is? Like in the ini file its blank to begin?

@DejaVu
Copy link
Collaborator

DejaVu commented Sep 17, 2011

Why can this no longer be merged?
Why has been left so long to be merged?

I only just noticed and it really needs adding too.

Should I just force them now?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants