Method mergeTrees

src/main/java/club/qqtim/diff/DiffUtil.java:140–149

key: path val: blob content Three-way merge @param headTree source tree @param otherTree target tree @return merged tree

(Map<String, String> baseTree, Map<String, String> headTree, Map<String, String> otherTree)

     * @return merged tree
     */
    public static Map<String, String> mergeTrees(Map<String, String> baseTree, Map<String, String> headTree, Map<String, String> otherTree) {
        final Map<String, List<String>> comparedTrees = compareTrees(baseTree, headTree, otherTree);
        Map<String, String> mergedTrees = new HashMap<>();
        comparedTrees.forEach((path, trees) -> {
            String mergeBlobs = mergeBlobs(trees.get(0), trees.get(1), trees.get(2));
            final String objectId = HashObject.hashObject(mergeBlobs.getBytes(StandardCharsets.UTF_8));
            mergedTrees.put(path, objectId);
        });
        return mergedTrees;
    }

    /**
     * diff3