bradenpowers

# overwrite master with contents of feature branch (feature > master)
git checkout feature    # source name
git merge -s ours master  # target name
git checkout master       # target name
git merge feature       # source name

bradenpowers

MacOS X + oh my zsh + powerline fonts + visual studio code (vscode) terminal settings

Thank you everybody, Your comments makes it better

Install oh my zsh

http://ohmyz.sh/

sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"

bradenpowers

# Put me in: ~/Library/Application Support/Sublime Text 2/Packages/User/

# Set your layout to Grid 4 - Go to view > layout > Grid: 4

# Based on this Gist from Fokke - https://gist.github.com/FokkeZB/6218345
# Alloy lay-out for Sublime Text http://withtitanium.com/2013/08/titanium-alloy-optimized-sublime-text-2-layout/
# Put me in: ~/Library/Application Support/Sublime Text 2/Packages/User/

import sublime, sublime_plugin, inspect
from os.path import splitext

bradenpowers

Keybase proof

I hereby claim:

• I am bradenpowers on github.
• I am bradenpowers (https://keybase.io/bradenpowers) on keybase.
• I have a public key whose fingerprint is 86B2 5447 DBDB 5C08 8241 F20C BF90 43B9 CEDA A537

To claim this, I am signing this object:

bradenpowers

function upload(name, file, callback) {	
	Ti.include('lib/sha-aws.js'); 	// file comes from this URL's project: http://aws.amazon.com/code/Amazon-S3/3236824658053653
	Ti.include('lib/webtoolkit.utf8.js'); 		// code for this file from this URL: http://www.webtoolkit.info/javascript-utf8.html
	Ti.include('lib/date.js'); 		// file comes from this URL: http://www.mattkruse.com/javascript/date/source.html
	
	var AWSAccessKeyID = appGlobal.config.s3AccessKey;
	var AWSSecretAccessKey = appGlobal.config.s3SecretKey;

	var AWSBucketName = appGlobal.config.s3BucketName;
	var AWSHost = appGlobal.config.s3Host;

bradenpowers

DialogWindow = function(message, type){
	
	// Default params
	var message = message || "How about you add some message to this? :)";
	var type = type || "error";
	
	var window = Titanium.UI.createWindow({
		width: 320,
		height: 44,
		top: 44,

bradenpowers

<?xml version="1.0" encoding="utf-8"?>
<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@android:id/tabhost"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent">
 
    <LinearLayout
        android:orientation="vertical"
        android:layout_width="fill_parent"
        android:layout_height="fill_parent"

bradenpowers

Sublime Text 2 – Useful Shortcuts (Mac OS X)

General

⌘T	go to file
⌘⌃P	go to project
⌘R	go to methods
⌃G	go to line
⌘KB	toggle side bar
⌘⇧P	command prompt

bradenpowers

exports.Person = function(firstName,lastName) {
    this.firstName = firstName;
    this.lastName = lastName;
};

bradenpowers

var mapview = Titanium.Map.createView({
    mapType: Titanium.Map.STANDARD_TYPE,
    region:{latitude:-33.8642194, longitude:151.2095497},
    animate:true,
    regionFit:true,
    annotations:[]
});


var getShops = Ti.Network.createHTTPClient();