Edyta2801

https://blog.michelemattioni.me/2013/01/29/what-do-i-do-when-my-pull-request-does-not-merge-automatically-in-master/

Why this happens
The problem is that both in master and in your branch some files have been changed, and their going in different directions. The content of the file in master is different from the one in your feature_branch, and git does not know which one to pick, or how to integrate them.

To solve this, you need to

Get the latest upstream/master
Switch to your master
merge the latest master in your master (Never develop in master, always develop in a feature branch)

mikroskeem

Arch Linux btrfs install

NOTE: Last update to this gist was on Jun 2, 2018. Most of the things here are out of date (e.g consider using zstd for transparent compression instead of lzo), so do your own research as well. Take care!

0. Prerequisites

• Plenty of storage - snapshots will take (sort of) a lot of space
• Latest Arch Linux install iso because those have newer kernels and more bugfixes in btrfs.
• Have previous experience with installing Arch (like you can install arch with a blind fold).
• Read everything through

abtrout

Password-store keeps your passwords (or any other sensitive information) saved in GnuPG encrypted files organized in ~/.password-store. For more information about GPG, consult the GNU Privacy Handbook.

Getting started

To get started, install pass and generate a keypair.

$ brew install pass
$ gpg --gen-key
$ gpg --list-keys