Skip to content

Instantly share code, notes, and snippets.

David Miller Orangetronic

View GitHub Profile
@fraserxu
fraserxu / auth.js
Last active Feb 6, 2018
Handling CORS in Meteor app
View auth.js
/*
* packages/reststop2/auth.js
* Add a method to handle OPTIONS request
*/
// return nothing
RESTstop.add('login', {'method': 'OPTIONS'}, function() {})
View gist:9997325

RESUMÉ: David Miller

Profile

Designer/developer fascinated by the promise of the web. Front end proficiency strong. Some excursions through full-stack development/deployment. Four years running successful freelance business. Youth educator in media-literacy focussed summer program. Fascinated by the way we use technology to engage with the world around us. Philosophy B.A. with breadth and depth of hands-on technical experience in design, complex problem-solving and analysis, and online technologies. Managerial and team experience as editor of student publications. Occasional musician.

Professional Experience

Freelance designer/developer, orangetronic.com — 2006 - present

View git-selective-merge.md

Example: You have a branch refactor that is quite different from master. You can't merge all of the commits, or even every hunk in any single commit or master will break, but you have made a lot of improvements there that you would like to bring over to master.

Note: This will not preserve the original change authors. Only use if necessary, or if you don't mind losing that information, or if you are only merging your own work.

On master:

> git co -b temp
You can’t perform that action at this time.