Skip to content

Instantly share code, notes, and snippets.

var d = require("domain");
setTimeout(function() {
console.log('domain stack length is now ' + d._stack.length);
}, 100);
d.create().run(function() {
d.create().run(function() {
d.create().run(function() {
d.create().on("error", function(e) {
@cxreg
cxreg / gist:4356821
Created December 22, 2012 00:42
domain fail
var domain = require('domain');
var d = domain.create();
d.on('error', function() {
console.log('caught');
});
d.run(function() {
throw new Error('meh');
});
(master)
A---B---C---E---F
\
D---G---H
(feature)
git rebase --onto master D feature
(master)
D---G---H
count@bokonon:~/foobar/foo$ ls .git/MERGE_*
.git/MERGE_HEAD .git/MERGE_MODE .git/MERGE_MSG
count@bokonon:~/foobar/foo$ git pull
Already up-to-date.
count@bokonon:~/foobar/foo$ ls .git/MERGE_*
ls: cannot access .git/MERGE_*: No such file or directory