SETA Keigo kseta

I get asked pretty regularly what my opinion is on merge commits vs rebasing vs squashing. I've typed up this response so many times that I've decided to just put it in a gist so I can reference it whenever it comes up again.

I use merge, squash, rebase all situationally. I believe they all have their merits but their usage depends on the context. I think anyone who says any particular strategy is the right answer 100% of the time is wrong, but I think there is considerable acceptable leeway in when you use each. What follows is my personal and professional opinion:

Basic RESTful API with Symfony 2 + FOSRestBundle (JSON format only) + FOSUserBundle + FOSOauthServerBundle

The API we are creating in this gist will follow these rules :

The API only returns JSON responses
All API routes require authentication
Authentication is handled via OAuth2 with password Grant Type only (no need for Authorization pages and such).
API versioning is managed via a subdomain (e.g. v1.api.example.com)

The API will be written in PHP with the Symfony 2 framework. The following SF2 bundles are used :

花火~ 最高な俺たちと糞コードの海

written by mizchi at 小物エンジニアの会.

最高の夏の花火について

	import Amplify from 'aws-amplify';
	import aws_exports from './aws-exports';
	import { withAuthenticator } from 'aws-amplify-react';
	import { I18n } from 'aws-amplify';

	Amplify.configure(aws_exports);

	const dict = {
	'ja': {
	'User does not exist.': "ユーザー名またはパスワードが正しくありません",

	$list-margin-left: 3rem;
	$ol-padding-left: 0.4rem;

	ul {
	margin-left: $list-margin-left;
	padding-left: 0;
	}

	ol {
	counter-reset: ol;

	FROM php:5.6-cli

	RUN apt-get update \
	&& apt-get install -y \
	libfreetype6-dev \
	&& rm -rf /var/lib/apt/lists/* \
	&& docker-php-ext-install iconv \
	&& apt-get remove -y \
	libfreetype6-dev \
	&& apt-get install -y \

	#!/bin/sh
	# chkconfig: 345 99 1
	# description: mailcatcher
	# processname: mailcatcher

	start() {
	echo -n "starting mailcatcher:"
	/usr/local/rbenv/shims/mailcatcher --http-ip=0.0.0.0
	return 0
	}

	<?php

	namespace Acme\DemoBundle\Controller;

	use Acme\DemoBundle\Form\Entity\Item;
	use Acme\DemoBundle\Form\Entity\Tag;
	use Acme\DemoBundle\Form\Type\ItemWithTagsType;
	use Symfony\Bundle\FrameworkBundle\Controller\Controller;
	use Symfony\Component\HttpFoundation\RedirectResponse;
	use Symfony\Component\HttpFoundation\Request;

	<?php

	namespace LM\Bundle\CoreBundle\Controller;

	use Symfony\Component\HttpFoundation\Request;
	use Symfony\Component\HttpFoundation\Response;
	use Symfony\Bundle\FrameworkBundle\Controller\Controller;

	class AppController extends Controller
	{

SETA Keigo kseta

Basic RESTful API with Symfony 2 + FOSRestBundle (JSON format only) + FOSUserBundle + FOSOauthServerBundle

花火~ 最高な俺たちと糞コードの海

自己紹介