Gabriel Ostrolucký ostrolucky

Git Bisect and Feature Branches

There are people out there who claim that merge-based workflows (that is, workflows which contain non-fast-forward merges) are bad. They claim that git bisect gets confused by merge-based workflows, and instead advocate rebase-based workflows without explicit feature branches.

They're wrong.

Furthermore, the "advantages" of their workflows are in fact disadvantages. Let me show you.

Locate the section for your github remote in the .git/config file. It looks like this:

[remote "origin"]
	fetch = +refs/heads/*:refs/remotes/origin/*
	url = [email protected]:joyent/node.git

Now add the line fetch = +refs/pull/*/head:refs/remotes/origin/pr/* to this section. Obviously, change the github url to match your project's URL. It ends up looking like this:

	<?php

	$attributeValues = array(
	'color' => array('Red', 'White', 'Blue'),
	'size' => array(1, 2, 3, 4),
	'fabric' => array('Cloth', 'Silk')
	);

	class Cartesian
	{

	<?php

	/**
	* Recursively takes the specified criteria and adds too the expression.
	*
	* The criteria is defined in an array notation where each item in the list
	* represents a comparison <fieldName, operator, value>. The operator maps to
	* comparison methods located in ExpressionBuilder. The key in the array can
	* be used to identify grouping of comparisons.
	*