background preloader

Basic Branching and Merging

Basic Branching and Merging
Let’s go through a simple example of branching and merging with a workflow that you might use in the real world. You’ll follow these steps: Do work on a web site.Create a branch for a new story you’re working on.Do some work in that branch. At this stage, you’ll receive a call that another issue is critical and you need a hotfix. You’ll do the following: Switch to your production branch.Create a branch to add the hotfix.After it’s tested, merge the hotfix branch, and push to production.Switch back to your original story and continue working. Basic Branching First, let’s say you’re working on your project and have a couple of commits already. You’ve decided that you’re going to work on issue #53 in whatever issue-tracking system your company uses. $ git checkout -b iss53 Switched to a new branch "iss53" This is shorthand for: $ git branch iss53 $ git checkout iss53 You work on your web site and do some commits. $ vim index.html $ git commit -a -m 'added a new footer [issue 53]' Basic Merging Note

http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

Related:  Config

Creating a SVG Pie Chart – HTML5 Updates: Growing pie chart with Raphael JS – Back to the actual post:- In one of my recent projects I had to create a simple pie chart kind of structure in SVG (Scalable Vector Graphics) based on values given in an array. So if the array has five values in it then the pie chart will have five slices, each slice representing a value. Here is how it looks, Calculating angles swiped by each slice Alright, so we need the angles that are swiped or covered by a each of the pie slices. Understanding Design Patterns in JavaScript Today, we're going to put on our computer science hats as we learn about some common design patterns. Design patterns offer developers ways to solve technical problems in a reusable and elegant way. Interested in becoming a better JavaScript developer? Then read on. Republished Tutorial

How gzip compression works - Make the Web Faster Authors: Kevin Khaw & Eric Higgins, Google Webmasters Recommended experience: Working knowledge of HTTP and HTML High level overview of a browser request with and without gzip compression Server without gzip: Browser: Delete All Data in a MySQL Table Posted July 16th, 2004 in MySql (Updated February 17th, 2009) MySQL is the world's most popular open source database, recognized for its speed and reliability. This article looks at how to delete all the data from a MySQL database table and how it affects auto incremental fields. Delete and Truncate

Environment Variables There are a handful of environment variables that you can set that will have an effect on your ability to compile software. These are: For compiling C code: CC, CFLAGS For compiling C++ code: CXX, CPPFLAGS For the linking stage: LDFLAGS rethinkdb on 2013-09-06 – irclogger – Freenode IRC logs 02:19 joshontheweb joined 04:20 joshontheweb joined 04:31 cinderblock_away joined A Basic MySQL Tutorial About MySQL MySQL is an open source database management software that helps users store, organize, and retrieve data. It is a very powerful program with a lot of flexibility—this tutorial will provide the simplest introduction to MySQL How to Install MySQL on Ubuntu and CentOS If you don't have MySQL installed on your droplet, you can quickly download it.

Visual Git History Log in Terminal Window My friend Joshua Kalis just showed me this cool trick which allows you to see a visual history (e.g. merges) in your terminal. Normally I bust out GitX-L every time I want to see a visual git history (this is akin to running Photoshop to select a color), but this technique is much more convenient. Edit your ~/.gitconfig file, and add the following lines: [alias] lg = log --graph --pretty=format:'%C(red)%h%C(reset) -%C(yellow)%d%C(reset) %s %C(green)(%cr) %C(blue)<%an>%C(reset)' --abbrev-commit --date=relative This will add a convenient git alias to your repertoire, in this case `lg` (accessible by using `git lg`). Personally, I like having even shorter aliases, so I edited my ~/.bash_profile file and added the following:

Test HTMLBars in Ember.js Canary - Ember.JS Howdy friends! Ember.js 1.10 will branch into beta in about a week. The HTMLBars templating engine is in master now, behind a feature flag. In order to catch more issues before beta (and to give us a better understanding of if the feature can move forward), I'd like to ask a favor. Installing / Updating Python on OS X While Python comes pre-installed on OS X, Apple doesn’t do a good job on keeping the Python runtime environment up to date. Currently, on Mac OS X 10.7.4 “Lion”, entering python -V returns Python 2.7.1. Even worse, Mac OS X 10.6 “Snow Leopard” is still on a Python 2.6 release. While the latest Python releases are always available on updating a Mac isn’t a simple, straight forward process. Follow along and update your Mac to Python 2.7.3, or 3.3.0 or whatever the newest 2.x and 3.x release might be, when you read this.

How to make Jim Beam Whiskey Meatballs Colin Joliat It’s tough to improve on the meatball, but I found a way. Whiskey and pretzels. No, you won’t be snacking and drinking with dinner. Those are the two secret ingredients in Whiskey Meatballs. You’ve probably noticed lately I’ve been using chipotle peppers quite a bit for the Guyism Grill.

Related: