ffittschen

Use IntelliJ or WebStorm as git mergetool

Configure Sourcetree

The merge tool that ships with JetBrain's IntelliJ IDEA or WebStorm is really awesome and way better than FileMerge. It is quite simple to configure SourceTree to use it as the default mergetool:

1. Open the SourceTree preferences and select the Diff tab
2. Choose Custom both as Visual Diff Tool and as Merge Tool
3. Paste the following commands into the textfields:

• Diff Command: /Applications/IntelliJ\ IDEA.app/Contents/MacOS/idea diff

ryantuck

set up ansible to work on localhost

i've found this useful for debugging ansible modules and syntax without having to use VMs or test in dev environments.

install ansible

pip install ansible

make some relevant config files