Beispie für ein git merge konflikt

git-merge-conflict.sh

rm -fr test
mkdir -p test
cd test
git init
cat > Test.java <<END
pubic void Test {
    public Test() {
        String s="";
    }

    publi void myAwesomeFunction() {
        return;
    }
}
END
cat > README <<END
This is a README file.
Adding myAwesomeFunction in Test class.
END
git add .
git commit -m "initial commit"

git branch feature
git checkout feature
cat > Test.java <<END
pubic void Test {
    public Test() {
        String s = "";
        s.toString();
    }

    publi void myAwesomeFunction() {
        return;
    }

    public void doNothing() {
        return;
    }
}
END
cat > README <<END
This is a README file.
Adding doNothing in Test class.
END
git add .
git commit -m "added toString and a function doNothing"
git checkout master 
cat > Test.java <<END
pubic void Test {
    public Test() {
        String s="";
        s.toUpperCase();
    }
 
    publi void myAwesomeFunction() {
        return;
    }

    public boolean isSomewath() {
        return true;
    }
}
END
cat > README <<END
This is a README file.
Adding isSomewath in Test class.
END
git add .
git commit -m "added toUpperCase and a function isSomewath"
git merge feature