Hello What is the recommended way to detect merge/rebase conflicts without actually modifying the worktree? Should I use some combination of custom $GIT_INDEX_FILE and --work-tree to lock the conflict resolution into a directory specially made for this purpose? Is there even a way to have the conflict-annotated files written to stdout instead of to file system when a merge fails? BR / Klas -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html