Git Conflict MCP

Instructions

Implementation Reference

• src/tools/postResolve.ts:11-18 (handler)

  The execution handler for the 'post_resolve' tool. Returns a markdown/text content prompting the user for confirmation before proceeding with conflict resolution.

  async () => {
      return {
          content: [{
              type: "text",
              text: "Are you sure you have resolved the conflict correctly? Please check again."
          }]
      };
  }

• src/tools/postResolve.ts:7-10 (schema)

  Configuration object defining the tool's description and input schema (empty object, no parameters required).

  {
      description: "Execute this tool BEFORE running resolve_conflict to confirm the resolution process. This acts as a safety confirmation step.",
      inputSchema: z.object({}),
  },

• src/tools/postResolve.ts:4-20 (registration)

  Registers the 'post_resolve' tool with the MCP server using server.registerTool, including name, config, and handler.

  export function registerPostResolve(server: McpServer) {
      server.registerTool(
          "post_resolve",
          {
              description: "Execute this tool BEFORE running resolve_conflict to confirm the resolution process. This acts as a safety confirmation step.",
              inputSchema: z.object({}),
          },
          async () => {
              return {
                  content: [{
                      type: "text",
                      text: "Are you sure you have resolved the conflict correctly? Please check again."
                  }]
              };
          }
      );
  }

• src/tools/index.ts:20-20 (registration)

  Calls registerPostResolve to include the 'post_resolve' tool in the overall tool registration during non-review mode setup.

  registerPostResolve(server);