Update GitTest.java

It is changed the message to create a conflict between local and
external repository.
Solve the conflict with github repository
solve
Merge branch 'master' of https://github.com/jmnieto/firstStep.git
At the end ;)