private String getConflictMessage() {
StringBuilder sb = new StringBuilder("Commit failed due to unresolved conflicts in ");
sb.append(parentAfter.getPath());
sb.append(" = {");
for (Tree conflict : parentAfter.getChild(NodeTypeConstants.REP_OURS).getChildren()) {
ConflictType ct = ConflictType.fromName(conflict.getName());
sb.append(ct.getName()).append(" = {");
if (ct.effectsNode()) {
sb.append(getChildNodeNamesAsString(conflict));
} else {
for (PropertyState ps : conflict.getProperties()) {
PropertyState ours = null, theirs = null;
switch (ct) {