deletion from branch post-master
animals class creation
in branch master animals.java changed to animo.java and conflict created in the last method ...
animals.java changing to animo.java
conflict added in branch post-master file animals.java
merge of file animals.java and animo.java
conflict creation ...
conflict creation 2
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 ...
syncing resolved ...