Use merge-tree instead of patch-id

[jerry-skydio]

Generate a patch id by merge-tree'ing old head into current base. Any conflict is treated as a different id. patch-id is the tree id
(do this commit by commit to create a series of ids. only do this if number of commits and commit text is the same)