Pull-request merge process

When it's a fix or feature branch

If I consider that all commits of the branch are good (well named, concerns correctly separated) then I use the Rebase and merge option. All commits are merge into develop as is without creating a merge commit (they are put just after the last commit in develop).

In the other hand, if there are "Work in progress" (WIP) commits in the branch, or if I consider that all commits refer to the same fix/feature and should be grouped, I use the Squash and merge option. All commits are grouped in one commit and put in develop (still without creating a merge commit). The commit will default take the name of the pull-request but you can change it if needed.


Keybase proof

I hereby claim:

  • I am roparz on github.
  • I am roparz ( on keybase.
  • I have a public key ASAiDnGuW_Q9XWixNgCkZTyFbpdszw0JTuPPxQq56l6S2go

To claim this, I am signing this object:

View .zshrc
export LESS="-RFX"
View check-tabs.js
'This file uses tabs instead of spaces for indentation': function(content) {
return content.match(/\t/g);
View check-css.js
var gulp = require('gulp'),
sniffer = require('gulp-sniffer');
var sniffs = {
'Use lighter|normal|bold instead of 100-900 for font-weight': function(content) {
return content.match(/font-weight: \d+/);
gulp.task('check-css', function() {
angular.module('whatever').directive 'cgContenteditable', ->
restrict: 'A'
ngModel: '='
link: (scope, elem, attrs) ->
elem = elem[0]
# 1
elem.setAttribute 'contenteditable', true
# 2
View .gitconfig
st = status
ci = commit
co = checkout
br = branch
rz = reset --hard HEAD
unwip = reset HEAD^
pr = pull --rebase
pf = push --force-with-lease
cp = cherry-pick
config = require 'config'
s3 = require 's3'
q = require 'q'
module.export = (oldKey, newKey) ->
defer = q.defer()
params =
# you need to set the s3 bucket in the CopySource key
CopySource: "#{ config.s3.bucket }/#{ oldKey }"
_build = (callback) ->
string = callback.toString()
mathes = string.match /function\s?\(([\w,\s?\$]+)\)\s?\{/
arr = mathes[1].split(', ')
arr.push callback
return arr
# using AngularUI Router
angular.module('app').config ($stateProvider) ->