Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DON'T MERGE] mGBA updates, Game Boy support #37

Closed
wants to merge 546 commits into from
Closed

[DON'T MERGE] mGBA updates, Game Boy support #37

wants to merge 546 commits into from

Conversation

sergiobenrocha2
Copy link

@sergiobenrocha2 sergiobenrocha2 commented May 8, 2016

Let's wait for the next release. Making a PR just to aware people to not waste time merging & fixing.

< endrift > sergio-br2: don't merge yet, the cheats changed heavily last night and I haven't had time to test them yet
< endrift > also game boy support is lackluster
< endrift > needs a lot of work

I tested it only on Linux.

endrift and others added 30 commits February 19, 2016 00:41
@inactive123
Copy link

inactive123 commented Aug 7, 2016

Can we merge this thing already now or how long is this going to take?

You havent even taken care of the merge conflict and yet this thing has stayed in here for months.

Must I absolutely do everything here by myself?

If you say 'dont merge', at least take the initiative by yourself to get it merge ready then or else nothing happens.

@andres-asm
Copy link

He is only honoring the author's wishes by not merging till the new features are ready

@inactive123
Copy link

inactive123 commented Aug 7, 2016

That was May 8, and honestly, we need to stay up to date.

Either that or we rebrase the repo altogether.

@sergiobenrocha2
Copy link
Author

There's no merge conflict, I fix that every time I merge it, I can say it's working fine at least on Linux.

Endrift said to not merge it, but if you are in the rush to merge, then do that.

@inactive123
Copy link

inactive123 commented Aug 7, 2016

In a rush to merge? this goddamn thing has been in wait here since May. You call this a 'rush', being months and months out of date?

@sergiobenrocha2
Copy link
Author

Merge it then I guess.

@sergiobenrocha2
Copy link
Author

Eh, I need to rebase against the new commits from the fork right? I forgot that.

@inactive123
Copy link

So what do we do here? Just make a new fork and transfer the static Makefile over?

@sergiobenrocha2
Copy link
Author

No, I'll try to sherry pick that cheevos commits

@sergiobenrocha2
Copy link
Author

I think it's better wait endrift implement cheevos, then we rollback some commits in master to be able merge this PR

<endrift> sergio-br2: there's no way you're going to be able to merge this yourself
<endrift> the infrastructure has changed too much
<endrift> with GB support
<endrift> this would break horribly
<sergio-br2> :/
<sergio-br2> so better you implement it yourself?
<endrift> yes

@inactive123
Copy link

Alright, lets close this then.

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.

10 participants