Lloyd Moore iolloyd

In the case that you have a branch you want to merge that is giving a lot of conflicts, it's quite often that you trust all the commits in the branch to be merged and you want some kind of way to add those during the merge by default.

Here is one way to do that painlessly.

  git checkout my-branch
  git merge branch-you-want-to-merge

At this point, there may be a bunch of conflicts. Run the following, rememberint the dot '.' when checking out.

 git checkout --theirs .

DB migrations flow

This is a proposal for dealing with database migrations when using git (or similiar). The problem with migrations is ensuring that the current state of the database is in sync with the code-base. In practice, this means being able to guarantee that the state of the database correctly reflects the version of the code checked out.

The correct way to build the database schema is to run all db migrations from zero. But as the project grows, this takes longer and longer to execute and quickly becomes inpractical.

To avoid having to re-run all the migrations, it makes sense to have a base sql that avoids running earlier migrations that are relevant to the currently deployed code.

With that in mind, the following is proposed:

	let rec hanoi f t x = function
	\| n when n = 1 ->
	(Printf.printf "Move from %i to %i\n" f t)
	\| n ->;
	hanoi f x t (n - 1); hanoi f t x 1; hanoi x t f (n - 1);
	in hanoi 1 2 3 5 (* number of rings *)

	And then dawn breaks, seemingly at once
	Puts paid to the touch of night time's hold

	Birdsong bathes the dew-soaked lawn
	Another day, life's own new-born

	On the horizon, where, from the sea,
	Up lifts the sun from depths unknown

	His sheaths of yellow fire run rife

	def insert(new_value, (l, v, r)):
	new_node = ((None, None, None), new_value, (None, None, None))
	if new_value < v:
	if not l:
	new_node = (new_node, v, r)
	else:
	new_node = (insert(new_value, l), v, r)

	elif new_value > v:
	if not r:

	let rec bal(l, v, r) =
	let hl = height l and hr = height r in
	match l, v, r with
	\| Node(ll, lv, lr, _), v, r when hl > hr+1 ->
	let hll = height ll and hlr = height lr in
	(match lr with
	\| Node(lrl, lrv, lrr, _) when hll < hlr ->
	node(node(ll, lv, lrl), lrv, node(lrr, v, r))
	\| lr -> node(ll, lv, node(lr, v, r)))
	\| l, v, Node(rl, rv, rr, _) when hl+1 < hr ->

	<?php

	$bits = ["Vn", " G", "ube", "agba"];

	function getsome($x) {
	return str_rot13($x);
	}

	function findTheKnob($x) {
	return getSome($x);

	# THEBRANCH is the branch that has the changes
	# THEFILE is the file that you want to update in the current branch

	git rev-list --reverse THEBRANCH -- THEFILE \| git cherry-pick -n --stdin

	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
	"http://www.w3.org/TR/html4/loose.dtd">
	<html>
	<head>
	<title>DBAPIError: (pyodbc.Error) ('01000', "[01000] [unixODBC][Driver Manager]Can't open lib 'SQL Server' : file not found (0) (SQLDriverConnect)") // Werkzeug Debugger</title>
	<link rel="stylesheet" href="?__debugger__=yes&cmd=resource&f=style.css" type="text/css">
	<!-- We need to make sure this has a favicon so that the debugger does not by
	accident trigger a request to /favicon.ico which might change the application
	state. -->
	<link rel="shortcut icon" href="?__debugger__=yes&cmd=resource&f=console.png">