Ruslan Y QuAzI

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:

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

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

	blueprint:
	name: Actionnable Task Reminder
	description: \|
	# Send an actionable and snoozable reminder notification

	Send a notification to the provided notification service to remind you a recurring task or event.

	Supports full customizable notification, snooze options and recurrency control.
	Support custom action when acknowledge the reminder.

	/** This version is ported by Atadiat to work on ESP8266 (tested on NodeMCU 1.0) **/
	/** Porting was done by Yahya Tawil**/


	// ESP32 WiFi <-> 3x UART Bridge
	// by AlphaLima
	// www.LK8000.com

	// Disclaimer: Don't use for life support systems
	// or any other situations where system failure may affect

	# Linux
	# add the following to "~/.gitconfig" file

	[merge]
	tool = intellij
	[mergetool "intellij"]
	cmd = /usr/local/bin/idea merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
	trustExitCode = true

	[diff]