yoitsro

Rebasing with Ro

Contents

1. Introduction
2. What is rebasing?
   • Interactive rebasing
   • Non-interactive rebasing
3. Scenario 1: The parent branch hasn't changed since you started work and you only have one commit
4. Scenario 2: The parent branch hasn't changed but you have multiple commits which need squashing
5. Scenario 3: The parent branch has changed and you only have one commit

yoitsro

it('creates a new collection with an image as a binary buffer', function(done) {
    var endpoint = '/collections';
    var url = SERVER_URL + endpoint;
    var method = 'POST';
    
    var form = new FormData();
    
    form.append('json', {"name": "Red stuff collection","filter": {"colour": "red"}});
    form.append('image', require('fs').readFileSync('./test/data/image.jpg'));
    

yoitsro

var restify = require('restify');

// Authentication
var passport        = require('passport');
var LocalStrategy   = require('passport-local').Strategy;
var sessions        = require("client-sessions");

var server = restify.createServer();
server.use(restify.queryParser());
server.use(restify.bodyParser());