slowbrewedmacchiato

$ git merge --no-commit --no-ff $BRANCH

$ git pull $REMOTE $BRANCH
# uh oh, that wasn't right
$ git reset --hard ORIG_HEAD
# all is right with the world

#see diff between current master and remote branch
$ git diff master origin/master

slowbrewedmacchiato

import Foundation
import Alamofire

public enum Router:URLRequestConvertible {
	public static let baseUrlString:String = "http://testapi.example.com"
	case Upload(fieldName: String, fileName: String, mimeType: String, fileContents: NSData, boundaryConstant:String);

	var method: Alamofire.Method {
		switch self {
			case Upload: