Ricardo A. Mercado FutoRicky

Squashing Git Commits

The easy and flexible way

This method avoids merge conflicts if you have periodically pulled master into your branch. It also gives you the opportunity to squash into more than 1 commit, or to re-arrange your code into completely different commits (e.g. if you ended up working on three different features but the commits were not consecutive).

Note: You cannot use this method if you intend to open a pull request to merge your feature branch. This method requires committing directly to master.

Switch to the master branch and make sure you are up to date:

Use these rapid keyboard shortcuts to control the GitHub Atom text editor on macOS.

Key to the Keys

⌘ : Command key
⌃ : Control key
⌫ : Delete key
← : Left arrow key
→ : Right arrow key
↑ : Up arrow key

Converting libraries to Ember CLI addons

In this guide we will cover two main cases:

Ember specific library
vendor library

Ember library

The Ember library will assume that Ember has already ben loaded (higher in the loading order) and thus will assume it has access to the Ember API.

	/**
	* Using Operator Mono in Atom
	*
	* 1. Open up Atom Preferences.
	* 2. Click the “Open Config Folder” button.
	* 3. In the new window’s tree view on the left you should see a file called “styles.less”. Open that up.
	* 4. Copy and paste the CSS below into that file. As long as you have Operator Mono SSm installed you should be golden!
	* 5. Tweak away.
	*
	* Theme from the screenshot (http://cdn.typography.com/assets/images/blog/operator_ide2.png):


	/*************************************************************/
	// NumeroALetras
	// The MIT License (MIT)
	//
	// Copyright (c) 2015 Luis Alfredo Chee
	//
	// Permission is hereby granted, free of charge, to any person obtaining a copy
	// of this software and associated documentation files (the "Software"), to deal
	// in the Software without restriction, including without limitation the rights

	eXtreme Go Horse (XGH) Process

	Quelle: http://gohorseprocess.wordpress.com

	Übersetzung ursprünglich von https://gist.github.com/Neffez/f8d907ba8289f14e23f3855011fa4e2f

	1. Ich denke, also ist es nicht XGH.
	In XGH wird nicht gedacht, es wird das erste gemacht, was in den Sinn kommt. Es gibt auch keine zweite Option, die erste ist schneller.

	2. Es gibt 3 Wege ein Problem zu lösen: den richtigen Weg, den falschen Weg und den XGH Weg, welcher exakt wie der falsche ist, aber schneller.

	// Reference: http://stackoverflow.com/questions/4822471/count-number-of-lines-in-a-git-repository

	$ git ls-files \| xargs wc -l