Month: August 2016
Resolving Cherry-Pick Git Conflicts with Incoming Changes
It’s as easy as pie: git cherry-pick --strategy=recursive -X theirs {hash}
Retrieving Your Encryption Passphrase – Ubuntu 16.04
Retrieving your encryption passphrase, assuming you chose to encrypt your home folder can be done…
Switch to the www-data user in terminal (using bash)
su -s /bin/bash www-data
Mac Terminal – Calculating SHA-256 in OSX
By default, doing a shasum in mac terminal gives you the shasum using algorithm 1.…