Add this function to your ZSH/BASH init to do a sane update of develop and master. Handy when you come back to a project after a couple of days.
Note that this doesn't merge develop into your current branch, but I'll leave that to you to add if you need it :).
Do you need Promises and other ES6 goodness. This will give you polyfills for your tests, and a working Karma, Browserify & Babelify setup.
This example has been drawn up for this StackOverflow question. You probably want to polyfill Promises, etc. unless all your supported browsers already contain it. You probably also want to keep your compilation/babelification/browserification process the same between build and test. Fortunately you can (hint: common config can live in package.json), but that's outside of the scope of this Gist.
I hereby claim:
To claim this, I am signing this object:
| <div> | |
| <alert ng-repeat="alert in alerts" type="{{alert.type}}" close="alert.close()">{{alert.message}}</alert> | |
| </div> |
| git branch -r --merged | grep -v master | grep -v develop | grep -v release | sed 's/origin\///' | xargs -n 1 git push --delete origin |
| @Grab(group='com.github.groovy-wslite', module='groovy-wslite', version='1.1.0') | |
| import groovy.xml.* | |
| import wslite.soap.* | |
| import wslite.http.auth.* | |
| def client = new SOAPClient('https://dummy:11443/ClinicalDocumentWSService/ClinicalDocumentWS?wsdl') | |
| client.authorization = new HTTPBasicAuthorization("mirth", "password") | |
| // Grab the latest member list |
| #!/usr/bin/env ruby | |
| ARGV.each do |arg| | |
| not_repo = [] | |
| unstaged = [] | |
| untracked = [] | |
| puts "Looking in #{arg}" | |
| all_dirs = Dir.entries(arg).select {|entry| File.directory? File.join(arg,entry) and !(entry =='.' || entry == '..') } |
| // The tests. | |
| it('test', function() { | |
| var a1 = []; | |
| a1.push({x:0, y:2}); | |
| a1.push({x:1, y:2}); | |
| a1.push({x:2, y:2}); | |
| a1.push({x:3, y:3}); | |
The cheat sheets in this Gist are for the Oxford Code Retreat on the 6/7/2014.