You really shouldn't checkin the *.mode1v3 and *.pbxuser - makes the commit way larger than it should be.

Good point. Is there any way to trim the commit. I'm still learning Git after years of SVN.

Uhh... best way would be to rewrite history, to purge the files completely, It's a bit tricky, google has some good answers on this. And add a .gitignore, it's really the repository master's fault ;) (and then re-open another request)

Look at GitHub crowd-sourced gitignore repo. It's got an Objective-C one, core OS ones for mac and more.

Thanks. The Objective-C .gitignore doesn't seem to play nicely with Github for Mac yet.

just pull into a branch and pull out whatever you want with git diff into a patch file, then apply the patch to whatever other branch directly.

FYI I'm planning to CLOSE this request WITHOUT MERGING.

I want to overwrite the main repository with the reklis fork - there are over 1,000 new lines, and 500 changed, since the last update to master. I believe all the changes in this pull request now exist in the reklis fork - either merged in, or have been reproduced by someone else?

If so - no work needed, they're already in place, and will be included automatically.

If not - please could you try re-applying your changes to the reklis fork, and see if it works OK?

Thanks!

Fine by me. Good luck with the merge. You're doing some great work.