ivelichkevich ivelichkevich

ivelichkevich / pom.xml

Created August 20, 2018 12:18 — forked from Rocketeer007/pom.xml

Surefire, Failsafe and Jacoco configuration for build

	<project>
	...
	<build>
	<plugins>
	<plugin>
	<groupId>org.jacoco</groupId>
	<artifactId>jacoco-maven-plugin</artifactId>
	<executions>
	<execution>
	<id>default-prepare-agent</id>

ivelichkevich / .gitconfig

Last active September 25, 2020 11:38 — forked from rambabusaravanan/.gitconfig

Git Diff and Merge Tool - IntelliJ IDEA

	# 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]