Marcis Bergmanis Marcisbee

Update 2022: git checkout -p <other-branch> is basically a shortcut for all this.

FYI This was written in 2010, though I guess people still find it useful at least as of 2021. I haven't had to do it ever again, so if it goes out of date I probably won't know.

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.

Exporting your 2FA tokens from Authy to transfer them into another 2FA application

IMPORTANT - Update regarding deprecation of Authy desktop apps

Past August 2024, Authy stopped supported the desktop version of their apps:
See Authy is shutting down its desktop app | The 2FA app Authy will only be available on Android and iOS starting in August for details.

And indeed, after a while, Authy changed something in their backend which now prevents the old desktop app from logging in. If you are already logged in, then you are in luck, and you can follow the instructions below to export your tokens.

If you are not logged in anymore, but can find a backup of the necessary files, then restore those files, and re-install Authy 2.2.3 following the instructions below, and it should work as expected.

	<!DOCTYPE html>
	<html>
	<head>
	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
	<title>WebKit contentEditable focus bug workaround</title>
	<script type='text/javascript' src='http://code.jquery.com/jquery-1.6.2.js'></script>
	<script type='text/javascript'>
	//<![CDATA[

	$(function(){

	// Add Rules to Stylesheets with JavaScript
	// http://davidwalsh.name/add-rules-stylesheets

	/* Getting the Stylesheet
	Which stylesheet you add the rules to is up to you. If you have a specific stylesheet in mind, you can add an ID to the LINK or STYLE element within your page HTML and get the CSSStyleSheet object by referencing the element's sheet property. The stylesheets can be found in the document.styleSheets object:*/

	var sheets = document.styleSheets; // returns an Array-like StyleSheetList

	/*
	Returns:

	if (!String.prototype.toCase) {
	Object.defineProperties(String.prototype, {
	'toCase': {
	value: function(type = 'camel') {

	const seperators = {
	'camel': '',
	'pascal': '',
	'snake': '_',
	'domain': '.',

	//########################################################################################

	var WebCom = {};
	////////////////////////////////////////////////////////
	// Initialize Web Component and Create an Instance
	////////////////////////////////////////////////////////

	// Need when creating an instance of a Web Component while using the polyfill
	WebCom.instance = function( fn, self ){ return (( Object.getPrototypeOf )? Object.getPrototypeOf( fn ) : fn.__proto__).call( self ); }

	export const h=(t,p,...c)=>({t,p,c,k:p&&p.key})
	export const render=(e,d,t=d.t\|\|(d.t={}),p,r,c,m,y)=>
	// arrays
	e.map?e.map((e,p)=>render(e,d,t.o&&t.o[p])):
	// components
	e.t.call?(e.i=render((render.c=e).t(Object.assign({children:e.c},e.p),e.s=t.s\|\|{},t=>
	render(Object.assign(e.s,t)&&e,d,e)),t.i\|\|d,t&&t.i\|\|{}),d.t=t=e):(
	// create notes
	m=t.d\|\|(e.t?document.createElement(e.t):new Text(e.p)),
	// diff props

	function setFocusIfFocusable(node) {
	if (node.nodeType !== Node.ELEMENT_NODE) {
	// Text and comment nodes aren't focusable.
	return false;
	}

	if (node.disabled === true) {
	// Disabled elements can't be focused.
	return false;
	}

	/**
	* Test if a string is a valid email address
	* using the constraint validation API, rather
	* than unwieldy regular expressions
	*
	* @param {string} value
	* @returns {boolean}
	*/
	const validateEmail = value => Object.assign(
	document.createElement('input'),

	export default class MailgunClient {
	apiKey: string;
	domain: string;
	defaults?: {
	from?: string;
	subject?: string;
	};

	constructor(apiKey: string, domain: string, defaults?: Record<string, any>) {
	this.apiKey = apiKey;