search

porridge / bambam

keyboard mashing and doodling game for babies and toddlers
GNU General Public License v3.0
71 stars 36 forks source link

Uniformize image/sound loading + use gif/wav from $XDG_DATA_HOME/bambam/data #3

Closed mgodlewski closed 8 years ago

vn971 commented 8 years ago

It may be reasonable to move "chimp.bmp" to "chimp.png" first, and consider the rest of the PR separately. (I can PR, of course.)

mgodlewski commented 8 years ago

What's missing in order to merge ?

vn971 commented 8 years ago

@mgodlewski If you're talking about merge conflicts: I saw your PR and extracted the "chimp.bmp" conversion (making it more correct on colors, too). https://github.com/porridge/bambam/pull/7 All conflicts would be visible if you use the command line for merging (or a very smart IDE).

porridge commented 8 years ago

Oh wow, @mgodlewski I never saw your commits from May 22nd until now! It looks good, but could you please rebase?

porridge commented 8 years ago

Actually, more important than rebasing, it would be great if you could squash the last two commits.

porridge commented 8 years ago

I mean the last two commits by @mgodlewski

mgodlewski commented 8 years ago

Hi,

I'm not able to squash my commits since they're already pushed. To make it right, I can cancel this pull request and create 2 separated ones :

Sorry for these circonvolutions, I'm not yet familiar to pull request mecanism.

Regards

porridge commented 8 years ago

You can update the current pull request by doing something like:

git rebase -i porridge/master # (or whatever name my master branch you can see at) git push origin +master # this will rewrite history, but it's fine since I didn't merge it yet

porridge commented 8 years ago

What's the status of this PR? Are there any changes left here that you'd like to merge?

mgodlewski commented 8 years ago

Hi,

Yes, I 've got some changes to introduce :

But this PR is too messy. I'll made another one. You can close this one.

Regards,

Mathieu