opengeo/GeoGit — pull request #340 by jdgarrett (2013-06-24 18:57:09+00:00)
Title: Fixed an issue which caused tree metadata id to be lost

Tree metadata ids would be lost when resolving conflicts. The new trees written when doing checkout --theirs or --ours would have a null metadata id.