conflict added in branch post-master file animals.java
merge of file animals.java and animo.java
conflict creation ...
Second commit resolved ...
Ok let put a tag here ...
test to verify the fast forwarded sentence ...
commit created 3 on master ...
added conflicts 4 on master...
added of commit that will be resolved by commit tools ...