Re: [AD] OSX fixes

Since you are a project member you can click on the "view command line instructions" next to the Merge button. But basically it's:

git pull --rebase git://github.com/peterhull90/allegro5.git osx-fixes

Then you will have his commits at the very top of the git history with "git log". (The github instructions actually keep the timeline and do a merge, but I find that more confusing.)

To delete all the changes again just do:

git checkout .

And you will be back at the Allegro5 master.

On Wed, Nov 11, 2015 at 8:10 PM, Trent Gamblin <trent@xxxxxxxxxx> wrote:

I have not yet understood how to test these pull requests without lots of messing with my checkout. What’s the easiest way?

From: Allegro-developers [mailto:allegro-developers-bounces@xxxxxxx] On Behalf Of Peter Hull
Sent: November 10, 2015 1:59 PM
To: allegro-developers@xxxxxxxxxx
Subject: [AD] OSX fixes

Hi all,
I've put in a pull request relating to some general fixes for OS X to make it work on 10.11.
https://github.com/liballeg/allegro5/pull/522
Hopefully the CI build will pass. Sorry it's a whole string of commits but I couldn't get them to apply separately (git skills insufficient) - let me know if there's a better way.
Pete

_______________________________________________
Allegro-developers mailing list
Allegro-developers@xxxxxxxxxx
https://mail.gna.org/listinfo/allegro-developers