Restore more modules to moonbase, fixes Chromium build #12

Closed
wants to merge 7 commits into
from

Projects

None yet

2 participants

@zmcgrew
Lunar Linux member

No description provided.

@sofar
Lunar Linux member

this contains a HUUUGE merge change, which is way too much. The 6 separate commits are fine, but you need to rebase before sending a pull request. As is, the merge commit is too big to accept.

@sofar sofar closed this Jul 12, 2012
@zmcgrew
Lunar Linux member

I'm not a git expert, and don't understand what I should do. Googling git rebase isn't proving terribly helpful.

@sofar
Lunar Linux member

yeah, we need to document this somehow. do you at least see that in github your request shows a huuuuge merge commit?

zmcgrew@a1d0ede

@sofar
Lunar Linux member

I did a manual pull/merge and that fixed it up, so, your changes are in at least.

@zmcgrew
Lunar Linux member

Thanks sofar.

I tried to use git rebase, but I seem to just have made it worse if you look at my commit log. =(

At least it's fixed now.

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