mitchellh

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:

johngrib

#!  /usr/local/bin/bash

MYGITHUB=johngrib
RAW=/tmp/$MYGITHUB-github
TABLE=/tmp/$MYGITHUB-github-table
COLORS=/tmp/$MYGITHUB-github-colors

curl -s https://github.com/$MYGITHUB/ > $RAW

TITLE=`cat /tmp/johngrib-github | pcregrep -M '[0-9,]+ contributions\s*\n\s*in the last year'`

bgauduch

Multiple git identities on one machine

One machine, several git identities (personal vs work, GitHub vs GitLab, two accounts on one provider). Each repository picks its own name, email and credentials. In a hurry: Appendix B, once per rule.

A wrong identity does not fail: git commits and pushes under the wrong author. Part 1 ends with the check that catches it.

Requirements

Feature	Minimum git

haruair

C# 초보가 C# 패키지를 만드는 방법

이상한모임 / Kobe Creations

김용균

프롤로그

C# 배우고 싶지만 쉽게 배울 수 없던 너란 언어

whitekid

import contextlib
import functools

class Defer(contextlib.ExitStack):
    def __call__(self, *args, **kwargs):
        self.callback(functools.partial(*args, **kwargs))

    def __del__(self):
        self.close()

allieus

# -*- coding: utf-8 -*-
from __future__ import unicode_literals
import os
from boto.route53 import connect_to_region
from boto.route53.record import ResourceRecordSets


def apply(domain, ip, ttl, region, access_key=None, secret_key=None):
    if access_key:
        os.environ.setdefault('AWS_ACCESS_KEY_ID', access_key)

perhapsspy

Django에서 Test 쉽고 빠르게 하기

django 기본 테스트는 데이터베이스 마이그레이션 덕에 느리고 번거롭기 때문에 py.test와 model_mommy를 사용해서 빠르게 테스트를 하는 방법을 소개함.

• py.test : http://pytest.org/
• pytest-django : http://pytest-django.readthedocs.org/
• model_mommy : http://model-mommy.readthedocs.org/

테스트 파일 레이아웃

honux77

개발자 추천 서적

(다혜가 이름 붙임)

대규모 서비스 성능 관련

• 웹 개발자를 위한 대규모 서비스를 지탱하는 기술
• 그림으로 공부하는 시스템 성능구조

IT 인프라 권장 도서

• 24시간 서버/인프라를 지탱하는 기술(http://www.yes24.com/24/goods/3377489?scode=032&OzSrank=1)
• 그림으로 공부하는 IT 인프라 구조(http://www.yes24.com/24/Goods/19041948?Acode=101)

item4

# add it yourself
my_man2() {
  man -t $1 | open -f -a /Applications/Preview.app
}
alias man2=my_man2

whitekid

package main

import (
	"errors"
	"fmt"
	"io/ioutil"
	"log"
	"os"
	"time"