Minh Chu minhchu

a simple git branching model

This is a very simple git workflow. It (and variants) is in use by many people. I settled on it after using it very effectively at Athena. GitHub does something similar; Zach Holman mentioned it in this talk.

Update: Woah, thanks for all the attention. Didn't expect this simple rant to get popular.

	<!DOCTYPE html>
	<html>
	<head>
	<meta charset="utf-8">
	<title>Library Website</title>

	<!-- CSS only -->
	<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-F3w7mX95PdgyTmZZMECAngseQB83DfGTowi0iMjiWaeVhAn4FJkqJByhZMI3AhiU" crossorigin="anonymous">

	<!-- JavaScript Bundle with Popper -->

	<!DOCTYPE html>
	<html>
	<head>
	<meta charset="utf-8">
	<title>Library Website</title>

	<!-- CSS only -->
	<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-F3w7mX95PdgyTmZZMECAngseQB83DfGTowi0iMjiWaeVhAn4FJkqJByhZMI3AhiU" crossorigin="anonymous">

	<!-- JavaScript Bundle with Popper -->

	<!DOCTYPE html>
	<html>
	<head>
	<meta charset="utf-8">
	<title>Minh's Website</title>

	<!-- Google fonts -->
	<link rel="preconnect" href="https://fonts.googleapis.com">
	<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
	<link href="https://fonts.googleapis.com/css2?family=Nunito:wght@200;300;400;600;700&display=swap" rel="stylesheet">

	<!DOCTYPE html>
	<html>
	<head>
	<meta charset="utf-8">
	<title>Minh's Website</title>
	<style type="text/css">
	.avatar {
	width: 128px;
	height: 128px;
	}

	version: 2

	jobs:
	build:
	working_directory: ~/user/repo

	environment:
	BASH_ENV: ~/.bashrc

	docker:

	# on feature branch
	git fetch origin staging
	git merge origin/staging

-from mixpanel_api import Mixpanel
-if __name__ == '__main__':
-    # API_Secret and Token of a Beeketing platform project
-    secret = ''
-    token = ''
-    mixpanel = Mixpanel(secret, token, pool_size=4, debug=True)
-    selector = '(properties["to_delete"] == true)'
-    parameters = {'selector': selector}

	const User = Authorization(['user', 'manager', 'admin'])
	const Manager = Authorization(['manager', 'admin'])
	const Admin = Authorization(['admin'])

	const UserPage = User(Users)
	const EditUserPage = Manager(EditUser)
	const CreateUserPage = Admin(CreateUser)

	<Router history={BrowserHistory}>
	<Route path="/" component={App}>

	// node.js server used to serve assets bundled by Webpack
	// use `npm start` command to launch the server.
	const webpack = require('webpack');
	const WebpackDevServer = require('webpack-dev-server');
	const config = require('../../config/webpack.local.config');
	console.log('Starting the dev web server...');
	const port = 8080;
	const path = require('path');

	const options = {