Skip to content

Instantly share code, notes, and snippets.

@JanosSarkoezi
JanosSarkoezi / git-merge-conflict.sh
Created December 30, 2018 13:23
Beispie für ein git merge konflikt
rm -fr test
mkdir -p test
cd test
git init
cat > Test.java <<END
pubic void Test {
public Test() {
String s="";
}