Patch Set 2:

Stefan Lay:
"I get suddenly a lot of conflicting changes"

This is because two different instances of same ObjectId (both have same SHA1) are different according to equals method. I'll implement this comparison on "string level", comparing SHA1 strings of both objects.