Merge Conflicts Detected

The following files have conflicts. Please choose how to resolve them.

{#each conflicts as conflict}

{conflict.file_path} {#if resolutions[conflict.file_path]} Resolved: {resolutions[conflict.file_path]} {/if}

Your Changes (Mine)

{conflict.mine}

Remote Changes (Theirs)

{conflict.theirs}

{/each}