César Ferreira cesarferreira

within current branch, squashes all commits that are ahead of master down into one

useful if you merged with upstream in the middle of your commits (rebase could get very ugly if this is the case)

commit any working changes on branch "mybranchname", then...

git checkout master
git checkout -b mybranchname_temp
git merge --squash mybranchname
git commit -am "Message describing all squashed commits"
git branch -m mybranchname mybranchname_unsquashed

Better local require() paths for Node.js

Problem

When the directory structure of your Node.js application (not library!) has some depth, you end up with a lot of annoying relative paths in your require calls like:

var Article = require('../../../models/article');

Those suck for maintenance and they're ugly.

Possible solutions

tmux cheat sheet

(C-x means ctrl+x, M-x means alt+x)

Prefix key

The default prefix is C-b. If you (or your muscle memory) prefer C-a, you need to add this to ~/.tmux.conf:

remap prefix to Control + a

Prereq:

apt-get install zsh
apt-get install git-core

Getting zsh to work in ubuntu is weird, since sh does not understand the source command. So, you do this to install zsh

wget https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | zsh

	class DeliveryWindowsAdapter : RecyclerView.Adapter<DeliveryWindowsAdapter.ViewHolder>() {

	var items: List<DeliveryWindowUiModel> by Delegates.observable(emptyList()) { _, oldList, newList ->
	autoNotify(oldList, newList) { o, n -> o.id == n.id }
	}

	override fun onBindViewHolder(holder: ViewHolder, position: Int) {
	val deliveryWindow = items[position]
	holder.title.text = deliveryWindow.title
	holder.price.text = deliveryWindow.friendlyPrice

	var fs = require('fs');
	var path = require('path');

	function base64ToPNG(data) {
	data = data.replace(/^data:image\/png;base64,/, '');

	fs.writeFile(path.resolve(__dirname, '../tmp/image.png'), data, 'base64', function(err) {
	if (err) throw err;
	});
	}

	public abstract class BaseMapperToPresentation<SOURCE, TARGET> {

	/**
	* Transforms a type into another
	*
	* @param toBeTransformed source that will be transformed
	* @return the transformed object
	*/
	public abstract TARGET mapToPresentation(SOURCE toBeTransformed);

	public abstract class BaseMapperToDomain<SOURCE, TARGET> {

	/**
	* Transforms a type into another
	*
	* @param toBeTransformed source that will be transformed
	* @return the transformed object
	*/
	public abstract TARGET mapToDomain(SOURCE toBeTransformed);

	class HybridMutableLiveData<T> : MutableLiveData<T>() {

	private val pending = AtomicBoolean(false)
	private val sticky = AtomicBoolean(false)

	@MainThread
	override fun observe(owner: LifecycleOwner, observer: Observer<T>) {

	// Observe the internal MutableLiveData
	super.observe(owner, Observer { t ->

	<color name="black">#**000000</color>


	100% — FF
	95% — F2
	90% — E6
	85% — D9
	80% — CC
	75% — BF
	70% — B3