{"_id":"git-conflict-mcp","_rev":"46-400b9b4ef3213f110ed6a84194ad5dca","name":"git-conflict-mcp","dist-tags":{"latest":"1.12.5"},"versions":{"1.0.0":{"name":"git-conflict-mcp","version":"1.0.0","_id":"git-conflict-mcp@1.0.0","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"85e290af51eb4d1408d1afb37fdf2d5eb501cdce","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.0.0.tgz","fileCount":24,"integrity":"sha512-65TlJAt1eoo8jHP6Pcu98pL2IRJAdVMVEPAhj6ZdF2LitDEf27rzFX8I7shjG8geZIyZQEUFwYiQUi07KbWKSg==","signatures":[{"sig":"MEUCICBac30ecM+hDaMrqI5KfKozfQ8mhJr4tmGSMgdyeOVmAiEA5unP2SYE+FZYgHbqyP1KGV16CDXMCQqmDqEitvSHugk=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":69530},"main":"dist/index.js","type":"module","_from":"file:git-conflict-mcp-1.0.0.tgz","scripts":{"build":"tsc","start":"node dist/index.js","typecheck":"tsc --noEmit"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/f108be232326c3210f5900581751f2b0/git-conflict-mcp-1.0.0.tgz","_integrity":"sha512-65TlJAt1eoo8jHP6Pcu98pL2IRJAdVMVEPAhj6ZdF2LitDEf27rzFX8I7shjG8geZIyZQEUFwYiQUi07KbWKSg==","_npmVersion":"10.9.2","description":"## Usage / 使い方","directories":{},"_nodeVersion":"22.16.0","dependencies":{"zod":"^4.1.13","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"typescript":"^5.0.0","@types/node":"^20.0.0"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.0.0_1764686557194_0.8660138539900688","host":"s3://npm-registry-packages-npm-production"}},"1.1.0":{"name":"git-conflict-mcp","version":"1.1.0","_id":"git-conflict-mcp@1.1.0","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"109bc9f8845b48f654bfc2f5154d5239d1ceca39","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.1.0.tgz","fileCount":28,"integrity":"sha512-1fQ5lI13W4yiR2W8Qca+VhgDlABt81zD5pdkPwJyWBL3g4FgIT4d7qES8Ei9J2bgKwZ0TTwJOYijMqrQfAyU0g==","signatures":[{"sig":"MEUCIQCsgNqYbchyhSZm14mGD9GT2LHbn6fOiNQwCxeJSdPw5wIgaKY6rroo/PzGzoJmJVSQPCVCr+fMU1gcQ5FM6x2m2Nw=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":74371},"main":"dist/index.js","type":"module","_from":"file:git-conflict-mcp-1.1.0.tgz","scripts":{"build":"tsc","start":"node dist/index.js","typecheck":"tsc --noEmit"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/1e11cc67f442c04385f04b52513e03eb/git-conflict-mcp-1.1.0.tgz","_integrity":"sha512-1fQ5lI13W4yiR2W8Qca+VhgDlABt81zD5pdkPwJyWBL3g4FgIT4d7qES8Ei9J2bgKwZ0TTwJOYijMqrQfAyU0g==","_npmVersion":"10.9.2","description":"## Usage / 使い方","directories":{},"_nodeVersion":"22.16.0","dependencies":{"zod":"^4.1.13","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"typescript":"^5.0.0","@types/node":"^20.0.0"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.1.0_1764688085316_0.3450651957664761","host":"s3://npm-registry-packages-npm-production"}},"1.1.2":{"name":"git-conflict-mcp","version":"1.1.2","_id":"git-conflict-mcp@1.1.2","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"7289e21b9a3262fae592e6248e18a6fc99a9917c","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.1.2.tgz","fileCount":28,"integrity":"sha512-KXrbHZZLGQM2KGyoUxDOvcIs+ebQNK1rnwAzKbI25xPWsOk7NSJZoNYlQR0d4sQ16N70LEIHKXzpZS5WajeeUA==","signatures":[{"sig":"MEUCIEnzfasZPGAy4e264BCTMi9HAlwPrypILSbiexe0TvBBAiEAr7IelGbKUv6cmmr4l/qTE7+G01RRZxKe60K3XdS+Pb4=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":76601},"main":"dist/index.js","type":"module","_from":"file:git-conflict-mcp-1.1.2.tgz","scripts":{"build":"tsc","start":"node dist/index.js","typecheck":"tsc --noEmit"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/5f29d238cff7832ff8edc7607dfcfa4e/git-conflict-mcp-1.1.2.tgz","_integrity":"sha512-KXrbHZZLGQM2KGyoUxDOvcIs+ebQNK1rnwAzKbI25xPWsOk7NSJZoNYlQR0d4sQ16N70LEIHKXzpZS5WajeeUA==","_npmVersion":"10.9.2","description":"## Usage / 使い方","directories":{},"_nodeVersion":"22.16.0","dependencies":{"zod":"^4.1.13","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"typescript":"^5.0.0","@types/node":"^20.0.0"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.1.2_1764690546372_0.7710712208583528","host":"s3://npm-registry-packages-npm-production"}},"1.1.3":{"name":"git-conflict-mcp","version":"1.1.3","_id":"git-conflict-mcp@1.1.3","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"1ce16b1246ab50e3383c4ebabfc5a0885361865e","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.1.3.tgz","fileCount":28,"integrity":"sha512-EqF6UT2IgNRRBTm086ZrJdeiIBQpPUVbcE342bp2mMAOdwG+Dx8rnX8cSW3hT/WaV3bagsjijxnD4y3Fj7b5YQ==","signatures":[{"sig":"MEUCIQDAWoln0olALaRk0aboJ1aAuDZZdYiXGAg/YzI+4xhrowIgdxWYwTp+oBYEaGmrJytmVQ4Lkz1vTfgrMRUoPG56YLo=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":77143},"main":"dist/index.js","type":"module","_from":"file:git-conflict-mcp-1.1.3.tgz","scripts":{"build":"tsc","start":"node dist/index.js","typecheck":"tsc --noEmit"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/572a793b94d1adcfd61dd1e6afbf08e7/git-conflict-mcp-1.1.3.tgz","_integrity":"sha512-EqF6UT2IgNRRBTm086ZrJdeiIBQpPUVbcE342bp2mMAOdwG+Dx8rnX8cSW3hT/WaV3bagsjijxnD4y3Fj7b5YQ==","_npmVersion":"10.9.2","description":"## Usage / 使い方","directories":{},"_nodeVersion":"22.16.0","dependencies":{"zod":"^4.1.13","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"typescript":"^5.0.0","@types/node":"^20.0.0"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.1.3_1764694111596_0.7908725809570887","host":"s3://npm-registry-packages-npm-production"}},"1.1.4":{"name":"git-conflict-mcp","version":"1.1.4","_id":"git-conflict-mcp@1.1.4","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"21763c33aadc6eb0c4a796917f5faecdba418442","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.1.4.tgz","fileCount":28,"integrity":"sha512-cieI0cTzHEVQdw7HI0YCmqeP2/Qjb7UU9KbAKiUqtiVDQpsb8yVUpyJoJH6Up50gbp6CR06pRf53Vfzff/og7g==","signatures":[{"sig":"MEUCIQDQuJAsfb1UMM3K+Urtd/N/ujUQ36AJ8XF0muX5wgMJPAIgbFnRNXGwklLNjyOjbsY7WUc0hbVcS5Fe0IGucif6Y9I=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":77275},"main":"dist/index.js","type":"module","_from":"file:git-conflict-mcp-1.1.4.tgz","scripts":{"build":"tsc","start":"node dist/index.js","typecheck":"tsc --noEmit"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/a7ee7479993861ddbf4502a5ab5d0333/git-conflict-mcp-1.1.4.tgz","_integrity":"sha512-cieI0cTzHEVQdw7HI0YCmqeP2/Qjb7UU9KbAKiUqtiVDQpsb8yVUpyJoJH6Up50gbp6CR06pRf53Vfzff/og7g==","_npmVersion":"10.9.2","description":"## Usage / 使い方","directories":{},"_nodeVersion":"22.16.0","dependencies":{"zod":"^4.1.13","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"typescript":"^5.0.0","@types/node":"^20.0.0"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.1.4_1764694285445_0.8326657512242981","host":"s3://npm-registry-packages-npm-production"}},"1.2.0":{"name":"git-conflict-mcp","version":"1.2.0","_id":"git-conflict-mcp@1.2.0","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"9e9712325021fc6e14c419db6045f0b8e4d452a7","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.2.0.tgz","fileCount":32,"integrity":"sha512-c46u3wqGWarKoZtUS9h8X+dLybgQtrNFQQnckUlT1Eoit/icLCl0JrN1veQsUTaduuLn1s6j11PzDlHkeQeFPw==","signatures":[{"sig":"MEUCIQD2BJN2btycwyZPU0I6IOIKL3TkscaGj6icS6HYUbZMTgIgV2PiXC7+CwNjVqfYjslRlEn1z/Mkm/R3JT78XJEclmk=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":93945},"main":"dist/index.js","type":"module","_from":"file:git-conflict-mcp-1.2.0.tgz","scripts":{"build":"tsc","start":"node dist/index.js","typecheck":"tsc --noEmit"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/4497c917403585004a30dae8e4ed69da/git-conflict-mcp-1.2.0.tgz","_integrity":"sha512-c46u3wqGWarKoZtUS9h8X+dLybgQtrNFQQnckUlT1Eoit/icLCl0JrN1veQsUTaduuLn1s6j11PzDlHkeQeFPw==","_npmVersion":"10.9.2","description":"## Usage / 使い方","directories":{},"_nodeVersion":"22.16.0","dependencies":{"zod":"^4.1.13","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"typescript":"^5.0.0","@types/node":"^20.0.0"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.2.0_1765042272954_0.6104506003592265","host":"s3://npm-registry-packages-npm-production"}},"1.2.1":{"name":"git-conflict-mcp","version":"1.2.1","_id":"git-conflict-mcp@1.2.1","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"215ecf156141cfea8580dcffef530f8753f99f92","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.2.1.tgz","fileCount":32,"integrity":"sha512-B1F5wJRyMa0fk8Zrxdv2Fml0tzgBLLgMiG4Ah4aRVRgYtMRK957BHb+a+nZnXpwheEgEr4nqFbUXjHCDL4maeQ==","signatures":[{"sig":"MEYCIQDT/40JwOi6Qt4EiqMuFQCiNUSf4BWISobX5yQG5NtE1gIhAKcNh4Ta8TvONuDflCDMmjCSA5sjpb88a+UYiCXwCeFr","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":94697},"main":"dist/index.js","type":"module","_from":"file:git-conflict-mcp-1.2.1.tgz","scripts":{"build":"tsc","start":"node dist/index.js","typecheck":"tsc --noEmit"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/fff30740d70520834c7fb4abdaf3c2db/git-conflict-mcp-1.2.1.tgz","_integrity":"sha512-B1F5wJRyMa0fk8Zrxdv2Fml0tzgBLLgMiG4Ah4aRVRgYtMRK957BHb+a+nZnXpwheEgEr4nqFbUXjHCDL4maeQ==","_npmVersion":"10.9.2","description":"## Usage / 使い方","directories":{},"_nodeVersion":"22.16.0","dependencies":{"zod":"^4.1.13","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"typescript":"^5.0.0","@types/node":"^20.0.0"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.2.1_1765042942889_0.47974023376047326","host":"s3://npm-registry-packages-npm-production"}},"1.2.2":{"name":"git-conflict-mcp","version":"1.2.2","_id":"git-conflict-mcp@1.2.2","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"5caec977c4eca001115ecadd627444f3850c720d","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.2.2.tgz","fileCount":32,"integrity":"sha512-cw/IlyBztpahkWPiCZQoc0KpKo2KV3lr+upaH0QHBa4X6nvd1qol6lt0IXLVmRfEx76FYlpAZBkv9XQS+hMeJQ==","signatures":[{"sig":"MEYCIQDMVXmG7m6HLJKD9o8aHPkWU2SvtKQXfTbGWdt7XQawqAIhAPaX0TFKdsah1EEa4/Emtvx36fKOw2g7VEpUOJvW6O/p","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":94814},"main":"dist/index.js","type":"module","_from":"file:git-conflict-mcp-1.2.2.tgz","scripts":{"build":"tsc","start":"node dist/index.js","typecheck":"tsc --noEmit"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/e496a58ecaf158ae58384642ac054a41/git-conflict-mcp-1.2.2.tgz","_integrity":"sha512-cw/IlyBztpahkWPiCZQoc0KpKo2KV3lr+upaH0QHBa4X6nvd1qol6lt0IXLVmRfEx76FYlpAZBkv9XQS+hMeJQ==","_npmVersion":"10.9.2","description":"## Usage / 使い方","directories":{},"_nodeVersion":"22.16.0","dependencies":{"zod":"^4.1.13","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"typescript":"^5.0.0","@types/node":"^20.0.0"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.2.2_1765043346684_0.7010270798300771","host":"s3://npm-registry-packages-npm-production"}},"1.3.0":{"name":"git-conflict-mcp","version":"1.3.0","_id":"git-conflict-mcp@1.3.0","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"2e1dc28b29eb032b98473b3b6b5e9d37f8637c5f","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.3.0.tgz","fileCount":32,"integrity":"sha512-N5emnP+DqLOH3w/CggK4FW6+uMd5F0qiGEF50efBjTmi9rNbwbcy2ng3NnsRxsnzReeweBs8GIRkcbcnp7YWMg==","signatures":[{"sig":"MEUCIQDc57YELapxnXRVc58FEWO/kN5UMN0Ghz7EcYiCZWxT5QIgRkNlElFLJEb2y3dmXswJZsUCUFAhrwnnY/Uve7b0YYM=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":141543},"main":"dist/index.js","type":"module","gitHead":"195dc5443d14a7740e24bf810acafb3f1d5e7117","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","typecheck":"tsc --noEmit"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"typescript":"^5.0.0","@types/node":"^20.0.0"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.3.0_1765425217653_0.3990566780454545","host":"s3://npm-registry-packages-npm-production"}},"1.3.1":{"name":"git-conflict-mcp","version":"1.3.1","_id":"git-conflict-mcp@1.3.1","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"81dc79a2d389c3e1c8a331057c45a8d0ea618f8a","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.3.1.tgz","fileCount":32,"integrity":"sha512-S85KxTQ3e0Mh1mL1aAPYNZclo1atKCPNZevUya7bPZLJctpqHkIt25mFpnKZ51z/pchzY3mBrriZprTVgR7q4w==","signatures":[{"sig":"MEYCIQDz+I/M4ohoPiT0DeD5Q0iV53nKWLY9/rbHbvR/3I1H/AIhAIp4BlY+MbXeNNAgxsP7zpDsJUHZfLoeslXwnJX+HUy5","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":142961},"main":"dist/index.js","type":"module","gitHead":"bb8f75c7df6cec9b2715186994ec2ad8a2864b85","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","typecheck":"tsc --noEmit"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"typescript":"^5.0.0","@types/node":"^20.0.0"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.3.1_1765463446388_0.8110700737741063","host":"s3://npm-registry-packages-npm-production"}},"1.3.2":{"name":"git-conflict-mcp","version":"1.3.2","_id":"git-conflict-mcp@1.3.2","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"63d7e86ecdf3d2e8deb180d9c55d289a13335fc6","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.3.2.tgz","fileCount":32,"integrity":"sha512-EU1nSFsJ+odmTI0QK8RF7EZJm7DgX9DFhsGka0ScN+yO+BZ299FTMHFwWytzypi4dZj3waOiN4lLiph52MUKTg==","signatures":[{"sig":"MEYCIQC3VFXIC4jxKDlVt8mrIaFpMR1nG6kAZ46MQLAcgsmFIgIhAKUDIkYxsayTeYkwo9Blwfr9DRCE2lDhh580GBafx709","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":143282},"main":"dist/index.js","type":"module","gitHead":"461464e1716bbb1706534c2c864eff5885074f31","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","typecheck":"tsc --noEmit"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"typescript":"^5.0.0","@types/node":"^20.0.0"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.3.2_1765463619241_0.275849192086137","host":"s3://npm-registry-packages-npm-production"}},"1.3.3":{"name":"git-conflict-mcp","version":"1.3.3","_id":"git-conflict-mcp@1.3.3","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"9f20ab45fa382c760bb9f22a6465e8bc69b66840","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.3.3.tgz","fileCount":32,"integrity":"sha512-txNMpFTHg4iW60ZTWYeAItha3yIcleh3r8olMt2Wpunx2pyOHhQM1wgDs6OEvRGWRWUCuf5qBRw7iMRKB0lLCQ==","signatures":[{"sig":"MEUCIGrULlKQovdacbX4Iyd1HClWmHyIE5vn+XLT3zkYeBmwAiEAm5DG0I2J46jYFStO9I7Lt0DgZNtkNHb7xkQpONb5ytw=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":159675},"main":"dist/index.js","type":"module","gitHead":"355939760f23c279dfa93edd01b9fd5bc0b85086","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","typecheck":"tsc --noEmit"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"typescript":"^5.0.0","@types/node":"^20.0.0"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.3.3_1765464268172_0.5602577786058218","host":"s3://npm-registry-packages-npm-production"}},"1.3.4":{"name":"git-conflict-mcp","version":"1.3.4","_id":"git-conflict-mcp@1.3.4","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"d494afb2dde9c9bc8e4121a6f8901cf12ce7937e","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.3.4.tgz","fileCount":32,"integrity":"sha512-xoyF+11R1WVD3sAJUB0Rwi5TvZhYTHXOHLCbK/MPUuVLfzvoPQ7i1mkAAwQ+V2okD1ZR307ya8/pj9zTOdrwMQ==","signatures":[{"sig":"MEUCIQC4076N8+Ue97hmXuJEE/kHyLx54/gRgXzopZFJXFUVPwIgPjNQct6Bs0RgqUMpZX5sVNIXERGsZIDZQ4i8FbbQwY0=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":159675},"main":"dist/index.js","type":"module","gitHead":"d457929ffad37dbf405fb35a06d0837242ad84c9","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","typecheck":"tsc --noEmit"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"typescript":"^5.0.0","@types/node":"^20.0.0"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.3.4_1765464801911_0.9070949588165944","host":"s3://npm-registry-packages-npm-production"}},"1.3.5":{"name":"git-conflict-mcp","version":"1.3.5","_id":"git-conflict-mcp@1.3.5","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"8a3a2a097c6e92834f47b3ab96eb7a9546b65a6f","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.3.5.tgz","fileCount":32,"integrity":"sha512-m2TN9AbqP/aKvtBXgBvOwCEuMlKQvCPmsZGS5wS+FJh6a8oovG6nZWJgmwRBEb6fpt3cv7Fdg5h59XOklsB9ug==","signatures":[{"sig":"MEUCIQCrnoLbj8CR6UK8NWp3od5w0MvXDfoNEx7OhOZi4wjHywIgMkU728TzJMpJFI1kOSzMdqmc7Yi48TO6gbwDg7PI4ac=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":159685},"main":"dist/index.js","type":"module","gitHead":"347e7b9fa9d35c42ffe15920431e4415392ab524","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","typecheck":"tsc --noEmit"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"typescript":"^5.0.0","@types/node":"^20.0.0"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.3.5_1765465677978_0.04867330541325443","host":"s3://npm-registry-packages-npm-production"}},"1.3.6":{"name":"git-conflict-mcp","version":"1.3.6","_id":"git-conflict-mcp@1.3.6","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"bb01c7a8913837bf6a13c5d1808ef091f4d96e31","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.3.6.tgz","fileCount":21,"integrity":"sha512-x8H4aNBOrwBCE0q/lgHlKAI+/sLw3eg5O3GR8gDZM2QWED5VLp/UJ3tCfdZqWwSPmbQE9dVAysp6UHx7/4lu9w==","signatures":[{"sig":"MEYCIQD9MSx7eVEfYTbQ65l0nH/u1fGYojC6lFRj2ela0sjB0wIhALqWpyJn/4hqJFXZgnhUXlhKgmmTYhmQQ0cfsgav3+T4","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":163179},"main":"dist/index.js","type":"module","gitHead":"ee19e91d3cb74c3f304a39629f952ff5903c48aa","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.3.6_1765547273671_0.4080159146293232","host":"s3://npm-registry-packages-npm-production"}},"1.3.7":{"name":"git-conflict-mcp","version":"1.3.7","_id":"git-conflict-mcp@1.3.7","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"a7f5cf636cc3be7b918af505801ea6b0051fb12b","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.3.7.tgz","fileCount":21,"integrity":"sha512-JCnREUylsv/Ewedrav7zaTjVXtfkWaIrR71nhinXYlajOKce7pBF5hYYpN41dEhlXnUPFeGLSEchUtDiDJrqdQ==","signatures":[{"sig":"MEQCIC1pqRp9yCD8e9CgS15nRgLJHkWjgAhJZ0vAGfFNTGk4AiAy/iv416cXLb9i5J8EsvVZieXY9jjHU3mVoaAPnOjfSQ==","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":171544},"main":"dist/index.js","type":"module","gitHead":"c29f4844305c098a3952ec7069a49580b11d0eb0","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.3.7_1765548286645_0.5505312679168364","host":"s3://npm-registry-packages-npm-production"}},"1.3.8":{"name":"git-conflict-mcp","version":"1.3.8","_id":"git-conflict-mcp@1.3.8","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"61c402a76f6b307d48b05149a1be385c4f2723a1","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.3.8.tgz","fileCount":21,"integrity":"sha512-wSwe3SM3HO2gqUmuMt0I2QVkEdYvkgKlW7gmiIkw4+Bg9n31yTawSHwZWzcWqG0m/hU5hSHEVo7id4xfreKfYw==","signatures":[{"sig":"MEUCIHM95acDj1UxRo7wVgVnjb5TSUcoTJEvvykcsOp9Bz4jAiEA0z+uwjptmJXKJyfifiOm8bQrds6doOhGupjyglVcXRs=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":171652},"main":"dist/index.js","type":"module","gitHead":"646059076efa24132cc91964293c4aa57a498e58","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.3.8_1765549702935_0.5988258372139519","host":"s3://npm-registry-packages-npm-production"}},"1.4.0":{"name":"git-conflict-mcp","version":"1.4.0","_id":"git-conflict-mcp@1.4.0","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"d017162ddcf3387b19374cae39646c2ad071ec1e","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.4.0.tgz","fileCount":21,"integrity":"sha512-sxlZd6e4YgeFiWQCTghpLAXB/+8R4HZI40Z/BZ1uX2xCWX9drdRBRPNL3vjc0quBYavKhuSvu+uiawd1arCjLw==","signatures":[{"sig":"MEUCIA358XjibBkYZt8JJupObitFnx9JhJdoukYDDMDVQp6hAiEA/RsbkRFcdyhP3sLmL176eySzHqJcaP3B/UrNWbYVOw4=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":172080},"main":"dist/index.js","type":"module","gitHead":"d855df56f624136fcf7e8479000eb9940eb3280f","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.4.0_1765551704617_0.8505910828045469","host":"s3://npm-registry-packages-npm-production"}},"1.5.0":{"name":"git-conflict-mcp","version":"1.5.0","_id":"git-conflict-mcp@1.5.0","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"8e3ae15c33ad8e121910e832c49fa66133fecc3c","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.5.0.tgz","fileCount":21,"integrity":"sha512-4iBwMb0ncFKcSnRVHISlBAd0ZArTL096T9tXWQp7WIU+5GV/LhoWlv8TvKk5rT8O0uk2YZnA3vnsArNGa5XWxA==","signatures":[{"sig":"MEUCIDaW3RCl0zBTMlKyn24OyVl4WP9qiYrkBBJvC9H+HKLCAiEAumahWI+cXbx2WTcrKN0sUYOna6VSXA11VQikJZ8VxPA=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":176287},"main":"dist/index.js","type":"module","gitHead":"b179503ebeda89af2e36aa7b94b1cd9a5a148577","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.5.0_1765552453386_0.61854954724273","host":"s3://npm-registry-packages-npm-production"}},"1.6.0":{"name":"git-conflict-mcp","version":"1.6.0","_id":"git-conflict-mcp@1.6.0","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"c46928d403d9165f97170fa0041253739d88955e","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.6.0.tgz","fileCount":21,"integrity":"sha512-Z+ATs6Y6vptPNHxp7usYwhi+Fx7m2zSy7l3pVghMn8qm/w+pI/MZ9OH9W/2pa3JAac80p2GHs9ombz8C0+5u4A==","signatures":[{"sig":"MEQCIErqS/e1BFmpRqKr6OcSjkOCTs3YP7IQVIiHcfeaUu8nAiArmAeoDH/+83ZQi65H9LO7pqvusC3STA3mxTgV5A3d2A==","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":176111},"main":"dist/index.js","type":"module","gitHead":"e4afee2762d8c5c9cb162befaa4eeb99f1db2920","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.6.0_1765554304242_0.06502430347761523","host":"s3://npm-registry-packages-npm-production"}},"1.6.1":{"name":"git-conflict-mcp","version":"1.6.1","_id":"git-conflict-mcp@1.6.1","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"a7e75e1db87c02c83a7c818d93fdd712a00b6c35","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.6.1.tgz","fileCount":21,"integrity":"sha512-IhMgipogO2FlqfVUIswYkMV4vktqUagckWPD9npFRY2XKqzieGPh9WP1yUKvoszYkdlj0XE+UrDkJ1uwarNtzQ==","signatures":[{"sig":"MEQCIEJ+x7ECbak9KIZsFYwNpDdHHoXS4blfi95pCN+3nLG8AiAMqmTZtaEFoPbk6cjQqV/sW6TAy/KdoesNCZY1/nx3Hw==","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":178530},"main":"dist/index.js","type":"module","gitHead":"764bb3ff3d699f81f73055105236e4fe57e78a3c","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.6.1_1765554861624_0.4270608260891484","host":"s3://npm-registry-packages-npm-production"}},"1.6.2":{"name":"git-conflict-mcp","version":"1.6.2","_id":"git-conflict-mcp@1.6.2","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"c756b5f93a7b92d8a8655547be2c5d07a7a14d7a","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.6.2.tgz","fileCount":21,"integrity":"sha512-2aajYpXVJjy1GpG6oVzncW/6WdaszTIR1NCGJgESx7ExgTmI997cWHey2O1MahDQR3BdJVIXTVCKC8GvrPw1VA==","signatures":[{"sig":"MEUCIQDZO0EAEhyuNN30Vt3+m+74MDrz3qHGx9aPAlInQmAjCQIgGoZOA7yuePsiZbHz8ZognzTdLyWaCUYEUfozONIo7bw=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":179234},"main":"dist/index.js","type":"module","gitHead":"0838d7e23dbfcbab156d1f79cc9f20070fe78ba2","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.6.2_1765555334358_0.1225371656073222","host":"s3://npm-registry-packages-npm-production"}},"1.7.0":{"name":"git-conflict-mcp","version":"1.7.0","_id":"git-conflict-mcp@1.7.0","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"3603ebdd08a862b7f4472ec88ffa98f2c68a4041","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.7.0.tgz","fileCount":21,"integrity":"sha512-RQnqAIF5jtYhxIoiRSZ4W78hyCAA9A2h0coU87KTVoyWH4c0DnGVrTVPka9MsEPtKn7zle8lTcJI99+POY21EQ==","signatures":[{"sig":"MEUCIAmb6Gwjs7XcNOt7ioogR4DepVjIPQtPuRhvE4flWWDmAiEAjzUvvvHfaW/DW38jHgJMJ98xmNm1yCQ/jOQu/aXhy2g=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":187534},"main":"dist/index.js","type":"module","gitHead":"04f68f3958d3a5fb4e2ccd0285bbbe8e44b4fcf4","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.7.0_1765556291457_0.44410939178694187","host":"s3://npm-registry-packages-npm-production"}},"1.7.2":{"name":"git-conflict-mcp","version":"1.7.2","_id":"git-conflict-mcp@1.7.2","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"639b06c2ccf3a9fd1304aefa87b2be732b572c59","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.7.2.tgz","fileCount":21,"integrity":"sha512-hUIBm6JVLCzlTfErTVLNrnkgtu4GANctGR4bP2+xy0NMRTxerSNtkI7jASOzulmTsNTs+P/Dp7iF/aw9tYxQPw==","signatures":[{"sig":"MEQCIB6lfxp/AANLUIoaQtRchf0MMGbE588k0Teie8Cp8W0QAiBXKZH9l2tRmwjHDicMGCQ9Zs9N5WGYcyTzaP6qkMWSmw==","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":189553},"main":"dist/index.js","type":"module","gitHead":"8081767fa0f6b62634cfefb8cbdfb03ba400c4bb","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.7.2_1765556752265_0.581437646630609","host":"s3://npm-registry-packages-npm-production"}},"1.8.0":{"name":"git-conflict-mcp","version":"1.8.0","_id":"git-conflict-mcp@1.8.0","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"216820b4de734092e15c44f166af629f8c233905","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.8.0.tgz","fileCount":21,"integrity":"sha512-OMTyl+Q/9wATgeuSlPXLFAyyM/kz6r48BN8bvRhxwQe0wcdwfslOzDYPstPZUXnBXaG2MLd/msa+0EUE0QOLDQ==","signatures":[{"sig":"MEYCIQCdn6+6/dhLELt6hKuXBusaACqOCZd2FQSn00HNXBNovAIhAJqcIzAFhRserZ453702+iO46hFLCypfNJI6Od5vCf5S","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":244608},"main":"dist/index.js","type":"module","gitHead":"19c268da8491729c54803ddec5a5633bf3f966f4","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.8.0_1765557869172_0.7278949951656724","host":"s3://npm-registry-packages-npm-production"}},"1.8.2":{"name":"git-conflict-mcp","version":"1.8.2","_id":"git-conflict-mcp@1.8.2","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"cce4a9ae54950f5bc56285e040b0228b7776542c","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.8.2.tgz","fileCount":21,"integrity":"sha512-eDE65lYB50heC5bS7IFk70e6pTPhaaCz6PrDnzGeo2NI+YAM+pz17Fd3u2MW2uB/LCun9OAWi8D0xk5Kml1JOg==","signatures":[{"sig":"MEUCIQDtO/Njtt6mOmglUIQKrnCphboyh2OhR+SLZsRNJOvOcgIgf017hP3a0g2Jv2+nBkGx8hzJKL5p1nOMelgyQZrXY+4=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":246515},"main":"dist/index.js","type":"module","gitHead":"bcf2c9ab05fba9496fbdd170e88f443e90027803","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.8.2_1765558527132_0.3981473598674241","host":"s3://npm-registry-packages-npm-production"}},"1.8.3":{"name":"git-conflict-mcp","version":"1.8.3","_id":"git-conflict-mcp@1.8.3","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"d0e8751c0534cc6226eb8e0de88f2b2d7f777187","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.8.3.tgz","fileCount":21,"integrity":"sha512-S8JC4UjDoRZ22yvpsxH+eL0ezuS8TmamKlfiFu+AfvsGDuX3nl8Y33hzD8quV3t27Og3xyheSMtdsSOl8fhN3g==","signatures":[{"sig":"MEUCIDBHDTdKLSoV560ftNgFRCP+SKlQfOMdaFPZw2emOdYeAiEA6iMm5TUOFOG/OfoDvCkB4cpC/E79/APM9FfFsb/jD9g=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":1163034},"main":"dist/index.js","type":"module","gitHead":"12b3ff19e492a3532d524cda161b40948372ff92","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.8.3_1765559160684_0.8750182254418339","host":"s3://npm-registry-packages-npm-production"}},"1.8.4":{"name":"git-conflict-mcp","version":"1.8.4","_id":"git-conflict-mcp@1.8.4","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"a9c464861d412fa651ae779cada7ed1009a2718c","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.8.4.tgz","fileCount":21,"integrity":"sha512-2ymvJQvFA2j6NcsNiDeITjYdf4wBzbppjmyuLsKemhVV2hUhZb7PXAbZepuf0oGS5yQr8E5dR3QpfrZleERUJQ==","signatures":[{"sig":"MEQCIFAWsSGbgHOrtDAZfm5m9pb7oEjM0moR3N6H6kekgaLEAiB83u8oEgMZ/5s76oQ43l/BEKj6BKxaeZM3RmbRzsQ+Qg==","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":1163035},"main":"dist/index.js","type":"module","gitHead":"3d87386a3720664736027edb9a5edc9cb507267a","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.8.4_1765559875433_0.10515119783360638","host":"s3://npm-registry-packages-npm-production"}},"1.8.5":{"name":"git-conflict-mcp","version":"1.8.5","_id":"git-conflict-mcp@1.8.5","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"a5cfa6d095d6755b1490dbd121b4885ce26f34d2","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.8.5.tgz","fileCount":21,"integrity":"sha512-bdr9xZYb+fk2zLdJxWnz+OGbYH/26R5puKyBk36W0RMkARsaQ5zOJmxacxiXi5Ic0VAikqZThb3BvXbHkYki7A==","signatures":[{"sig":"MEYCIQChupBBadcYlqXPZmGvZ18dm1TEadi5KESDVEW7R1SHXAIhAJMsIG2XQQDt8cg/vR/omdqj5DLAYhtV1Q9SJh0t6AaD","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":1163035},"main":"dist/index.js","type":"module","gitHead":"2601c05eafb1a4a2494169d57bc58bd511060e79","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.8.5_1765560217820_0.09540129588432289","host":"s3://npm-registry-packages-npm-production"}},"1.8.6":{"name":"git-conflict-mcp","version":"1.8.6","_id":"git-conflict-mcp@1.8.6","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"7a6c9f26065e0c615bf527213db702d648ce519a","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.8.6.tgz","fileCount":21,"integrity":"sha512-abxs4KtOkIjqqaEbzpaVDNdzkWVuj6MX5ki5EEaqLHY7jiFRwkphmHUJB98ROwcC3td9X7TmCNDO+zT5BaF3Zw==","signatures":[{"sig":"MEUCIQCl5V0YfBiw0OG4cYtErFKOALBHl8BrDxJ9phJIDSmVnQIgIX3v0VIJK9On23Igkj8yK0mISTW3NPhTDVy6m9iHy1g=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":1163309},"main":"dist/index.js","type":"module","gitHead":"4a54574ad862db7b4a0688cd3741a45755ac6a09","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.8.6_1765560836992_0.44354727629005053","host":"s3://npm-registry-packages-npm-production"}},"1.10.0":{"name":"git-conflict-mcp","version":"1.10.0","_id":"git-conflict-mcp@1.10.0","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"86be960a09fc8419682723099b2ee0e295f6f1fa","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.10.0.tgz","fileCount":21,"integrity":"sha512-H2AsSYymrGvLRpgogiMcnEQnRIOwReqmQ9Dz0nDBteHsb9niKwyYMOTaBpLiDs8IjI2ro9QeB+0kDlmYU8JH1Q==","signatures":[{"sig":"MEUCIQC9YW6VN4E6z/26PuMCk4oQPWnOc4A8ef0L1SN8wffXNQIgfmso0PXmYDZae4DxsNyGlvDp1sPmxL0+t+CB3mleTic=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":1165469},"main":"dist/index.js","type":"module","gitHead":"74ed7d4fca200a7448e89c4024ebebfeaa7cedf2","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.10.0_1765573886229_0.9979217716711333","host":"s3://npm-registry-packages-npm-production"}},"1.11.3":{"name":"git-conflict-mcp","version":"1.11.3","_id":"git-conflict-mcp@1.11.3","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"e4233913bfb62ba09928cd3bd8cd2708e959ad82","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.11.3.tgz","fileCount":18,"integrity":"sha512-ApuKRK0j79LoJ82Vbw8rvGcDfq7OVg4v4VpWO+rR5v8sCGzalLxuT+hlyaSojMDaptREzQPIW6s90ufShXejdg==","signatures":[{"sig":"MEUCIH5ieEPqzyMK5hzAxNSMjRQusuo3INkrifROlz1DW/+6AiEAsJaEMFenSGafK994s6PshAxMhvBOi0+KL4pNzeNdCDk=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"attestations":{"url":"https://registry.npmjs.org/-/npm/v1/attestations/git-conflict-mcp@1.11.3","provenance":{"predicateType":"https://slsa.dev/provenance/v1"}},"unpackedSize":1170670},"main":"dist/index.js","type":"module","gitHead":"02dd53fbe1273e035cdc22e8acad5efdec651f6d","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"repository":{"url":"git+https://github.com/mattyatea/git-conflict-mcp.git","type":"git"},"_npmVersion":"10.8.2","description":"## Usage / 使い方","directories":{},"_nodeVersion":"20.19.6","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.11.3_1765577844431_0.09507929255181735","host":"s3://npm-registry-packages-npm-production"}},"1.11.4":{"name":"git-conflict-mcp","version":"1.11.4","_id":"git-conflict-mcp@1.11.4","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"2ddff19b20ca06a858b533a1533081660ab0f09e","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.11.4.tgz","fileCount":18,"integrity":"sha512-t+GJM1yuQi1+nqh0j37+f+5BsfgFttG24WvyJNSFgeV39KkkKMduqgHn2X+GIw/GQvKeRmQgE0iPGWR03IEAaw==","signatures":[{"sig":"MEUCIAXjpMrovn1g67Rq2y2oArxLYfYoeqSK0PLe9PhRwLjNAiEAhB3eIReww4tFRJ1xp+Rl1kEjstEBVCT3zSlA4aeTT0Y=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"attestations":{"url":"https://registry.npmjs.org/-/npm/v1/attestations/git-conflict-mcp@1.11.4","provenance":{"predicateType":"https://slsa.dev/provenance/v1"}},"unpackedSize":1170687},"main":"dist/index.js","type":"module","gitHead":"648e1f51c9dc976a684b8e9486ff0bf08c32d542","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"repository":{"url":"git+https://github.com/mattyatea/git-conflict-mcp.git","type":"git"},"_npmVersion":"10.8.2","description":"## Usage / 使い方","directories":{},"_nodeVersion":"20.19.6","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.11.4_1765579809370_0.30983720048523145","host":"s3://npm-registry-packages-npm-production"}},"1.11.5":{"name":"git-conflict-mcp","version":"1.11.5","_id":"git-conflict-mcp@1.11.5","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"bin":{"git-conflict-mcp":"dist/index.js"},"dist":{"shasum":"b242c89a3c47938a3f0ab4784068a47b28ad9321","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.11.5.tgz","fileCount":18,"integrity":"sha512-+eApIyTKOANu539SLhZB9O4mL4JkXWyfQxDIfRl+cWys5OauHNmyB3nK6yv4n5LDIhlsexZpz7u27CFO7iNyzw==","signatures":[{"sig":"MEUCIQCfSQ6UTI2EKAqnw0T4GOCvlpb436QaLfdtXoyFMJxWcwIgbxmPIItWsx06g+oOMnev6WL0yAtBGBQMUTUl1MpkJOo=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"attestations":{"url":"https://registry.npmjs.org/-/npm/v1/attestations/git-conflict-mcp@1.11.5","provenance":{"predicateType":"https://slsa.dev/provenance/v1"}},"unpackedSize":1171700},"main":"dist/index.js","type":"module","gitHead":"9ff94705e2282638c652b00e36e44e1d1cb83800","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"repository":{"url":"git+https://github.com/mattyatea/git-conflict-mcp.git","type":"git"},"_npmVersion":"10.8.2","description":"## Usage / 使い方","directories":{},"_nodeVersion":"20.19.6","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.11.5_1765582594123_0.6178185605345765","host":"s3://npm-registry-packages-npm-production"}},"1.11.6":{"name":"git-conflict-mcp","version":"1.11.6","_id":"git-conflict-mcp@1.11.6","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"bin":{"git-conflict-mcp":"dist/index.js","git-conflict-mcp-webui":"dist/webui/server.js"},"dist":{"shasum":"c93aca2b3ef6514296a25d70370f12e1fe46a586","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.11.6.tgz","fileCount":21,"integrity":"sha512-QBcIJycHQnrl7WkyP8s5iriufk48Sparw/JkMmgQ0FDXLwpiMCWdaOE3ZnYcGx8x6MNpq02J4OBvQnRQDVAsUw==","signatures":[{"sig":"MEYCIQC1Vk/fSYV8TZwYBX0ItOtMHOlZGFjcobMRXOYGfQ69KQIhAO7Twik/MH8aMmiZJFss6Vdb4TiEr6NIpf0yjDY0nbdF","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":1174666},"main":"dist/index.js","type":"module","gitHead":"7ce8e68c2f2eef2e055cb2f8b92b70083b2a6dbd","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"repository":{"url":"git+https://github.com/mattyatea/git-conflict-mcp.git","type":"git"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.11.6_1765583031183_0.059542145232631905","host":"s3://npm-registry-packages-npm-production"}},"1.11.7":{"name":"git-conflict-mcp","version":"1.11.7","_id":"git-conflict-mcp@1.11.7","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"bin":{"git-conflict-mcp":"dist/index.js","git-conflict-mcp-webui":"dist/webui/server.js"},"dist":{"shasum":"516d326b6556eb5dc3efbb8e2ceaeb915676eaee","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.11.7.tgz","fileCount":21,"integrity":"sha512-f4/sIX+NCjQJPN5jHVHKB8YRJ4rSIz2MtYdwBzxc2+6RbcDWAUoVe9Jvevg9xpbxz0woQkzUCCwmFlRAah62XQ==","signatures":[{"sig":"MEUCIEJcvCFjn8vvWfP74U8ZF7t0dDpMkuZ+xDnWYfBwwSaLAiEAtQfxkEq/IlJe12N+w23gLMsD7dCrOsBPWRRDOrZ7jMw=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":1174951},"main":"dist/index.js","type":"module","gitHead":"b8dd97a5209a56e5e9f8fe4889770509d256da8a","scripts":{"build":"tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build:webui && npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"repository":{"url":"git+https://github.com/mattyatea/git-conflict-mcp.git","type":"git"},"_npmVersion":"11.3.0","description":"You can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.11.7_1765583267858_0.5775630692161937","host":"s3://npm-registry-packages-npm-production"}},"1.11.8":{"name":"git-conflict-mcp","version":"1.11.8","_id":"git-conflict-mcp@1.11.8","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"bin":{"git-conflict-mcp":"dist/index.js","git-conflict-mcp-webui":"dist/src/webui/server.js"},"dist":{"shasum":"9630d5092b46ae4e28a80cb2afc01662aa43692f","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.11.8.tgz","fileCount":18,"integrity":"sha512-msJ2uSJ85sSl5WJvGpV5xSO8CJdeObdxLVVqb6psMYDWEL8e86GKcqFX1xxc200HeqCBpRmYTjeESF3YS9iU9g==","signatures":[{"sig":"MEUCIHIHTBJ3M6FUeKgnRSSijKiKyZXTmMCc05ub6xbipKQEAiEAnt+toGUmDMu0nDVQ9r7z1cRKfzF1lNsiL8zVQqrRF5I=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"attestations":{"url":"https://registry.npmjs.org/-/npm/v1/attestations/git-conflict-mcp@1.11.8","provenance":{"predicateType":"https://slsa.dev/provenance/v1"}},"unpackedSize":1172199},"main":"dist/index.js","type":"module","gitHead":"9e350d246656ffcc73efb62297e6b8a96aa4a447","scripts":{"build":"npm run build:webui && tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:core":"tsc","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"repository":{"url":"git+https://github.com/mattyatea/git-conflict-mcp.git","type":"git"},"_npmVersion":"10.8.2","description":"## Usage / 使い方","directories":{},"_nodeVersion":"20.19.6","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.11.8_1765585772838_0.39993939449106963","host":"s3://npm-registry-packages-npm-production"}},"1.11.9":{"name":"git-conflict-mcp","version":"1.11.9","_id":"git-conflict-mcp@1.11.9","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"bin":{"git-conflict-mcp":"dist/index.js","git-conflict-mcp-webui":"dist/src/webui/server.js"},"dist":{"shasum":"ea52b055f42ddfa9532742723fe70408d5abd35d","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.11.9.tgz","fileCount":18,"integrity":"sha512-AycTUB0PCEVsHC9GjpJbOUsUleFSEHPeGIa3s0p4iRjhUkhS0tTTweN32wQPCerJg9efY/vANoGdTP18e3Nk2A==","signatures":[{"sig":"MEUCIE/h+Pns9YpMF9KEkJjv+SfHAQviqB2e9HoYZ09Gjr1eAiEAkINlZU9dQ1teFakH3AfI6NbE6AyArzwIZpjzhgFZ83k=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"attestations":{"url":"https://registry.npmjs.org/-/npm/v1/attestations/git-conflict-mcp@1.11.9","provenance":{"predicateType":"https://slsa.dev/provenance/v1"}},"unpackedSize":1171186},"main":"dist/index.js","type":"module","gitHead":"16027d2bbc5205d94d0bb682d99a1203b5e658b7","scripts":{"build":"npm run build:webui && tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:core":"tsc","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"repository":{"url":"git+https://github.com/mattyatea/git-conflict-mcp.git","type":"git"},"_npmVersion":"10.8.2","description":"## Usage / 使い方","directories":{},"_nodeVersion":"20.19.6","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.11.9_1765586288061_0.6283415923914666","host":"s3://npm-registry-packages-npm-production"}},"1.11.10":{"name":"git-conflict-mcp","version":"1.11.10","_id":"git-conflict-mcp@1.11.10","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"bin":{"git-conflict-mcp":"dist/index.js","git-conflict-mcp-webui":"dist/src/webui/server.js"},"dist":{"shasum":"aadb965fa277b3d9bc58bbfb1a66af6ef2b3a8c4","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.11.10.tgz","fileCount":18,"integrity":"sha512-CnzNAw6o72Q8BGVl59N3YzFx1Pg8sqxNGPpTPKp5gLIQn33adh30U/TgysljH+koLn3J/wJlqwddbpZ6Ig4xwA==","signatures":[{"sig":"MEUCIQCP8hfT7dSxCFYNFT8GMkvKsUcaTxYyZKxqmOyilO/xwAIgYM2cJ7ACekNsXx9vIGWbQUk/gXe6WcEmIkOXs+BxFzQ=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"attestations":{"url":"https://registry.npmjs.org/-/npm/v1/attestations/git-conflict-mcp@1.11.10","provenance":{"predicateType":"https://slsa.dev/provenance/v1"}},"unpackedSize":1171187},"main":"dist/index.js","type":"module","gitHead":"0df8b9d5d692a2d9e3cfeec7501328cae7297534","scripts":{"build":"npm run build:webui && tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:core":"tsc","build:webui":"vite build","prepublishOnly":"npm run build:all"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"repository":{"url":"git+https://github.com/mattyatea/git-conflict-mcp.git","type":"git"},"_npmVersion":"10.8.2","description":"## Usage / 使い方","directories":{},"_nodeVersion":"20.19.6","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.11.10_1765590983829_0.05670030971761042","host":"s3://npm-registry-packages-npm-production"}},"1.11.12":{"name":"git-conflict-mcp","version":"1.11.12","_id":"git-conflict-mcp@1.11.12","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"bin":{"git-conflict-mcp":"dist/index.js","git-conflict-mcp-webui":"dist/src/webui/server.js"},"dist":{"shasum":"23e845e6ae08f7db9b762195bb3c815c0a878f36","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.11.12.tgz","fileCount":21,"integrity":"sha512-O8z6YPIEFVxLvIdk9Xa2NbLZf6L4XbMVKhvw8wNJgbuxAFzbnaSyX3uPQuJby/viapIePF6EhebNcMAPgWIbMg==","signatures":[{"sig":"MEUCIQD2iFX27CM5A5hRcoitfIglLqkPhkqHIWYUekLX7O4eaAIgD2IEaA9lH0xXOfAO3trAn8tlDX4VGGuzSIlvQItQlKs=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":1175924},"main":"dist/index.js","type":"module","_from":"file:git-conflict-mcp-1.11.12.tgz","scripts":{"build":"npm run build:webui && tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:core":"tsc","build:webui":"vite build"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/ba87da171e1a7b2aac560d23849a66ca/git-conflict-mcp-1.11.12.tgz","_integrity":"sha512-O8z6YPIEFVxLvIdk9Xa2NbLZf6L4XbMVKhvw8wNJgbuxAFzbnaSyX3uPQuJby/viapIePF6EhebNcMAPgWIbMg==","repository":{"url":"git+https://github.com/mattyatea/git-conflict-mcp.git","type":"git"},"_npmVersion":"11.3.0","description":"A powerful Model Context Protocol (MCP) server designed to help AI agents and developers resolve Git merge conflicts efficiently. It includes a built-in visual WebUI for interactive conflict resolution.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.11.12_1766151364484_0.8002693032304449","host":"s3://npm-registry-packages-npm-production"}},"1.11.13":{"name":"git-conflict-mcp","version":"1.11.13","_id":"git-conflict-mcp@1.11.13","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"bin":{"git-conflict-mcp":"dist/index.js","git-conflict-mcp-webui":"dist/src/webui/server.js"},"dist":{"shasum":"f01f4672dc79d31c1152138c3b8f217e46f1b153","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.11.13.tgz","fileCount":22,"integrity":"sha512-SashJsl5DTjfEZp4OP3GCqoWZhax4yf53GV3KKXVZJKaOSKafcis5jr92t3gt0ZS1OEudpmGg9Qf8BOQBWlbzg==","signatures":[{"sig":"MEUCIQCARUKTv5sTq1jaUW8hw3zWsVPpiP1LCb1hS4UsKnbAsgIgRC2QoPKXSiTZTGHCgE+DPJ+kWsh/6au8tyqGWSUvRb0=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":1176540},"main":"dist/index.js","type":"module","_from":"file:git-conflict-mcp-1.11.13.tgz","scripts":{"build":"npm run build:webui && tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:core":"tsc","build:webui":"vite build"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/2b02c981ea0ae75612736dd0b36aca4e/git-conflict-mcp-1.11.13.tgz","_integrity":"sha512-SashJsl5DTjfEZp4OP3GCqoWZhax4yf53GV3KKXVZJKaOSKafcis5jr92t3gt0ZS1OEudpmGg9Qf8BOQBWlbzg==","repository":{"url":"git+https://github.com/mattyatea/git-conflict-mcp.git","type":"git"},"_npmVersion":"11.3.0","description":"A powerful Model Context Protocol (MCP) server designed to help AI agents and developers resolve Git merge conflicts efficiently. It includes a built-in visual WebUI for interactive conflict resolution.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.11.13_1766153260009_0.133178520113171","host":"s3://npm-registry-packages-npm-production"}},"1.12.0":{"name":"git-conflict-mcp","version":"1.12.0","_id":"git-conflict-mcp@1.12.0","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"bin":{"git-conflict-mcp":"dist/index.js","git-conflict-mcp-webui":"dist/src/webui/server.js"},"dist":{"shasum":"a27fc9e0f9badf048d0095a6509d79f2e8013554","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.12.0.tgz","fileCount":23,"integrity":"sha512-ZhDUfLxm0tVyKtOku2JqV3qUMvZ3R/k0ygWkFs0aQjMumnUkfjkveo0O/4s42dl8g6K6bjqlN8nkb8BB1aLY3g==","signatures":[{"sig":"MEYCIQCY/v/YFtV1rW3S3FZ3aeE5qSNJi/4RNfP6WZvCFmDqhAIhAMpB9UA6chvNiYb8Anr9lfgodfvM43xPfk7BpsjoPD85","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":1183367},"main":"dist/index.js","type":"module","_from":"file:git-conflict-mcp-1.12.0.tgz","scripts":{"build":"npm run build:webui && tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:core":"tsc","build:webui":"vite build"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/ecdc10af438178d956718c0598f75aa2/git-conflict-mcp-1.12.0.tgz","_integrity":"sha512-ZhDUfLxm0tVyKtOku2JqV3qUMvZ3R/k0ygWkFs0aQjMumnUkfjkveo0O/4s42dl8g6K6bjqlN8nkb8BB1aLY3g==","repository":{"url":"git+https://github.com/mattyatea/git-conflict-mcp.git","type":"git"},"_npmVersion":"11.3.0","description":"A powerful Model Context Protocol (MCP) server designed to help AI agents and developers resolve Git merge conflicts efficiently. It includes a built-in visual WebUI for interactive conflict resolution.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","minimist":"^1.2.8","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/minimist":"^1.2.5","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.12.0_1766154571578_0.4364999793161668","host":"s3://npm-registry-packages-npm-production"}},"1.12.1":{"name":"git-conflict-mcp","version":"1.12.1","_id":"git-conflict-mcp@1.12.1","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"bin":{"git-conflict-mcp":"dist/index.js","git-conflict-mcp-webui":"dist/src/webui/server.js"},"dist":{"shasum":"7535999bdb30dae5c263f6d910411d09bc6f74a4","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.12.1.tgz","fileCount":25,"integrity":"sha512-RxRvBs7I6uR2hwKbldH5VZvJ0Q+K6Bm2Zw8mQckpCOqwwObFPIEMrf3MZayDzNoetCxQ21V/sjrbbLW6ZisXwg==","signatures":[{"sig":"MEUCIQCUSzPNWHbrmb4V93xK5J/QhHdlCCWlimcAG19rr1RwNgIgXlTh6uaBxDt3V1oorWKKfywyZi481ldLzEemR5r/p10=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":1188732},"main":"dist/index.js","type":"module","_from":"file:git-conflict-mcp-1.12.1.tgz","scripts":{"build":"npm run build:webui && tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:core":"tsc","build:webui":"vite build"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/855e874af6e57338f0c763fb04662afd/git-conflict-mcp-1.12.1.tgz","_integrity":"sha512-RxRvBs7I6uR2hwKbldH5VZvJ0Q+K6Bm2Zw8mQckpCOqwwObFPIEMrf3MZayDzNoetCxQ21V/sjrbbLW6ZisXwg==","repository":{"url":"git+https://github.com/mattyatea/git-conflict-mcp.git","type":"git"},"_npmVersion":"11.3.0","description":"A powerful Model Context Protocol (MCP) server designed to help AI agents and developers resolve Git merge conflicts efficiently. It includes a built-in visual WebUI for interactive conflict resolution.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","minimist":"^1.2.8","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/minimist":"^1.2.5","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.12.1_1766155763388_0.08586775020601967","host":"s3://npm-registry-packages-npm-production"}},"1.12.3":{"name":"git-conflict-mcp","version":"1.12.3","_id":"git-conflict-mcp@1.12.3","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"bin":{"git-conflict-mcp":"dist/index.js","git-conflict-mcp-webui":"dist/src/webui/server.js"},"dist":{"shasum":"87ec4a70cc1adaecc9f1489c3bbb3ec00c82141f","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.12.3.tgz","fileCount":25,"integrity":"sha512-kmAheFxP0JJNCOLeMAb9a1OLuyvkYwZ/sWZXvGz9taWM8UdwE4CJbiIvvii0ff17IJuNe0bj3P06zOjiaHiYcQ==","signatures":[{"sig":"MEUCIQDoIpVMlts+3uC5+Y+lSpUcIDANeTvLZFtD72b75PUzngIgCG3D3YqFIdr7hJYvgbxMJzsdp07GLpaLxrJGTRGiDWE=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":1188914},"main":"dist/index.js","type":"module","_from":"file:git-conflict-mcp-1.12.3.tgz","scripts":{"build":"npm run build:webui && tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:core":"tsc","build:webui":"vite build"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/1afb42ad7da0b7a3d63a162e44b749f9/git-conflict-mcp-1.12.3.tgz","_integrity":"sha512-kmAheFxP0JJNCOLeMAb9a1OLuyvkYwZ/sWZXvGz9taWM8UdwE4CJbiIvvii0ff17IJuNe0bj3P06zOjiaHiYcQ==","repository":{"url":"git+https://github.com/mattyatea/git-conflict-mcp.git","type":"git"},"_npmVersion":"11.3.0","description":"A powerful Model Context Protocol (MCP) server designed to help AI agents and developers resolve Git merge conflicts efficiently. It includes a built-in visual WebUI for interactive conflict resolution.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","minimist":"^1.2.8","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/minimist":"^1.2.5","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.12.3_1766156172399_0.5888947404354321","host":"s3://npm-registry-packages-npm-production"}},"1.12.4":{"name":"git-conflict-mcp","version":"1.12.4","_id":"git-conflict-mcp@1.12.4","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"bin":{"git-conflict-mcp":"dist/index.js","git-conflict-mcp-webui":"dist/src/webui/server.js"},"dist":{"shasum":"10ee51ea61b4b85fb6b4babde007b054b8d5adbe","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.12.4.tgz","fileCount":25,"integrity":"sha512-c1rvle87/e5CceQ4w53OALbFgQ4AAj2dkSLbFpur4wDheXcE8Q8tlZu4rp8FU/S/LHJ9EH7+deT4cMEDKpjBsg==","signatures":[{"sig":"MEUCIQCD9NT/TrD1Y+UM7KM5TUA1suTe3QbSAkRXJDeM62JC9wIgIX3sk6Yu00hal3cZMdcaAt0nujQVXyWY5JksqCCdOko=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":1189417},"main":"dist/index.js","type":"module","_from":"file:git-conflict-mcp-1.12.4.tgz","scripts":{"build":"npm run build:webui && tsc","start":"node dist/index.js","webui":"node dist/src/webui/server.js","build:all":"npm run build","dev:webui":"vite","typecheck":"tsc --noEmit","build:core":"tsc","build:webui":"vite build"},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/32a1a0b1cc15108c29cd083e97fb1842/git-conflict-mcp-1.12.4.tgz","_integrity":"sha512-c1rvle87/e5CceQ4w53OALbFgQ4AAj2dkSLbFpur4wDheXcE8Q8tlZu4rp8FU/S/LHJ9EH7+deT4cMEDKpjBsg==","repository":{"url":"git+https://github.com/mattyatea/git-conflict-mcp.git","type":"git"},"_npmVersion":"11.3.0","description":"A powerful Model Context Protocol (MCP) server designed to help AI agents and developers resolve Git merge conflicts efficiently. It includes a built-in visual WebUI for interactive conflict resolution.","directories":{},"_nodeVersion":"24.1.0","dependencies":{"zod":"^4.1.13","minimist":"^1.2.8","mime-types":"^3.0.2","highlight.js":"^11.11.1","@types/minimist":"^1.2.5","@types/highlight.js":"^9.12.4","@modelcontextprotocol/sdk":"^1.23.0"},"_hasShrinkwrap":false,"devDependencies":{"vue":"^3.5.25","vite":"^7.2.7","postcss":"^8.5.6","typescript":"^5.0.0","@types/node":"^20.0.0","tailwindcss":"^4.1.18","autoprefixer":"^10.4.22","@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@vitejs/plugin-vue":"^6.0.3"},"_npmOperationalInternal":{"tmp":"tmp/git-conflict-mcp_1.12.4_1766157210557_0.7774865904107027","host":"s3://npm-registry-packages-npm-production"}},"1.12.5":{"name":"git-conflict-mcp","version":"1.12.5","repository":{"type":"git","url":"git+https://github.com/mattyatea/git-conflict-mcp.git"},"type":"module","main":"dist/index.js","bin":{"git-conflict-mcp":"dist/index.js","git-conflict-mcp-webui":"dist/src/webui/server.js"},"devDependencies":{"@tailwindcss/vite":"^4.1.18","@types/mime-types":"^3.0.1","@types/node":"^20.0.0","@vitejs/plugin-vue":"^6.0.3","autoprefixer":"^10.4.22","postcss":"^8.5.6","tailwindcss":"^4.1.18","typescript":"^5.0.0","vite":"^7.2.7","vue":"^3.5.25"},"dependencies":{"@modelcontextprotocol/sdk":"^1.23.0","@types/highlight.js":"^9.12.4","@types/minimist":"^1.2.5","highlight.js":"^11.11.1","mime-types":"^3.0.2","minimist":"^1.2.8","zod":"^4.1.13"},"scripts":{"build":"npm run build:webui && tsc","build:webui":"vite build","build:core":"tsc","build:all":"npm run build","dev:webui":"vite","start":"node dist/index.js","webui":"node dist/src/webui/server.js","typecheck":"tsc --noEmit"},"_id":"git-conflict-mcp@1.12.5","description":"A powerful Model Context Protocol (MCP) server designed to help AI agents and developers resolve Git merge conflicts efficiently. It includes a built-in visual WebUI for interactive conflict resolution.","bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","_integrity":"sha512-CtOAL+K5IDAQMu8uYOejdrOL0DT121ahzKO/cRyxdXWfp7kCbctm/Q5AGMVxjxBBcdB3ZZS4g5e8diRvboZrBA==","_resolved":"/private/var/folders/x7/5wgsw7d15wd4140rvp1_csz80000gn/T/9580c897144de2e1dc330e19f96a2172/git-conflict-mcp-1.12.5.tgz","_from":"file:git-conflict-mcp-1.12.5.tgz","_nodeVersion":"24.1.0","_npmVersion":"11.3.0","dist":{"integrity":"sha512-CtOAL+K5IDAQMu8uYOejdrOL0DT121ahzKO/cRyxdXWfp7kCbctm/Q5AGMVxjxBBcdB3ZZS4g5e8diRvboZrBA==","shasum":"271a81948baddcc399caa2d069ecafa9e7bc0e9e","tarball":"https://registry.npmjs.org/git-conflict-mcp/-/git-conflict-mcp-1.12.5.tgz","fileCount":25,"unpackedSize":1189871,"signatures":[{"keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U","sig":"MEUCIF+IjBjIVWYFBAcN1HFLVc7rbsVXp1bLumO3RDp5PgNoAiEAjs9A9KFkYS8WDPtyfgh4encoExoSEQ9Hsn7Y1ImaUhU="}]},"_npmUser":{"name":"mattyatea","email":"mattyatea@pm.me"},"directories":{},"maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"_npmOperationalInternal":{"host":"s3://npm-registry-packages-npm-production","tmp":"tmp/git-conflict-mcp_1.12.5_1766159521407_0.34186449235226535"},"_hasShrinkwrap":false}},"time":{"created":"2025-12-02T14:42:37.193Z","modified":"2025-12-19T15:52:01.905Z","1.0.0":"2025-12-02T14:42:37.395Z","1.1.0":"2025-12-02T15:08:05.492Z","1.1.2":"2025-12-02T15:49:06.581Z","1.1.3":"2025-12-02T16:48:31.787Z","1.1.4":"2025-12-02T16:51:25.637Z","1.2.0":"2025-12-06T17:31:13.092Z","1.2.1":"2025-12-06T17:42:23.036Z","1.2.2":"2025-12-06T17:49:06.841Z","1.3.0":"2025-12-11T03:53:37.803Z","1.3.1":"2025-12-11T14:30:46.542Z","1.3.2":"2025-12-11T14:33:39.403Z","1.3.3":"2025-12-11T14:44:28.314Z","1.3.4":"2025-12-11T14:53:22.059Z","1.3.5":"2025-12-11T15:07:58.156Z","1.3.6":"2025-12-12T13:47:53.808Z","1.3.7":"2025-12-12T14:04:46.805Z","1.3.8":"2025-12-12T14:28:23.080Z","1.4.0":"2025-12-12T15:01:44.761Z","1.5.0":"2025-12-12T15:14:13.532Z","1.6.0":"2025-12-12T15:45:04.373Z","1.6.1":"2025-12-12T15:54:21.791Z","1.6.2":"2025-12-12T16:02:14.516Z","1.7.0":"2025-12-12T16:18:11.601Z","1.7.2":"2025-12-12T16:25:52.425Z","1.8.0":"2025-12-12T16:44:29.311Z","1.8.2":"2025-12-12T16:55:27.294Z","1.8.3":"2025-12-12T17:06:00.890Z","1.8.4":"2025-12-12T17:17:55.655Z","1.8.5":"2025-12-12T17:23:37.975Z","1.8.6":"2025-12-12T17:33:57.212Z","1.10.0":"2025-12-12T21:11:26.397Z","1.11.3":"2025-12-12T22:17:24.587Z","1.11.4":"2025-12-12T22:50:09.583Z","1.11.5":"2025-12-12T23:36:34.368Z","1.11.6":"2025-12-12T23:43:51.413Z","1.11.7":"2025-12-12T23:47:48.068Z","1.11.8":"2025-12-13T00:29:33.035Z","1.11.9":"2025-12-13T00:38:08.206Z","1.11.10":"2025-12-13T01:56:23.991Z","1.11.12":"2025-12-19T13:36:04.656Z","1.11.13":"2025-12-19T14:07:40.195Z","1.12.0":"2025-12-19T14:29:31.786Z","1.12.1":"2025-12-19T14:49:23.551Z","1.12.3":"2025-12-19T14:56:12.567Z","1.12.4":"2025-12-19T15:13:30.758Z","1.12.5":"2025-12-19T15:52:01.642Z"},"bugs":{"url":"https://github.com/mattyatea/git-conflict-mcp/issues"},"homepage":"https://github.com/mattyatea/git-conflict-mcp#readme","repository":{"type":"git","url":"git+https://github.com/mattyatea/git-conflict-mcp.git"},"description":"A powerful Model Context Protocol (MCP) server designed to help AI agents and developers resolve Git merge conflicts efficiently. It includes a built-in visual WebUI for interactive conflict resolution.","maintainers":[{"name":"mattyatea","email":"mattyatea@pm.me"}],"readme":"# git-conflict-mcp\n\nA powerful Model Context Protocol (MCP) server designed to help AI agents and developers resolve Git merge conflicts efficiently. It includes a built-in visual WebUI for interactive conflict resolution.\n\n## Features\n\n- **MCP Tools**: Full suite of tools for agents to detect, read, and resolve git conflicts.\n- **Visual WebUI**: A dedicated web interface (default: http://localhost:3456) for human-in-the-loop resolution.\n  - **Syntax Highlighting**: Read code clearly with automatic language detection.\n  - **Diff View**: See changes clearly with intelligent diff display.\n  - **Editable Interface**: Directly edit conflicting files in the browser.\n  - **IDE Integration**: One-click opening of files in your preferred editor (VSCode, WebStorm, Cursor, etc.).\n- **Smart Port Management**: Automatically detects if the WebUI is already running and reuses the instance to avoid conflicts.\n- **Conflict Tracking**: Keeps track of resolution status and rejection reasons.\n\n## Usage\n\n### via npx\n\nYou can run the server directly using `npx`. This requires no manual installation if you have Node.js installed.\n\n```bash\nnpx -y git-conflict-mcp\n```\n\nThe WebUI will start automatically. You can access it at:\nhttp://localhost:3456\n\n## MCP Configuration\n\n### Claude Desktop\n\nYou can add the server using the `claude` CLI:\n\n```bash\nclaude mcp add git-conflict-mcp -- npx -y git-conflict-mcp\n```\n\nOr manually edit `claude_desktop_config.json`:\n\n```json\n{\n  \"mcpServers\": {\n    \"git-conflict-mcp\": {\n      \"command\": \"npx\",\n      \"args\": [\"-y\", \"git-conflict-mcp\"],\n      \"env\": {\n        \"WEBUI_PORT\": \"3456\"\n      }\n    }\n  }\n}\n```\n\n### Codex\n\nYou can add the server using the `codex` CLI:\n\n```bash\ncodex mcp add git-conflict-mcp -- npx -y git-conflict-mcp\n```\n\n### JSON Type (Generic)\n\n```json\n{\n  \"mcpServers\": {\n    \"git-conflict-mcp\": {\n      \"command\": \"npx\",\n      \"args\": [\"-y\", \"git-conflict-mcp\"]\n    }\n  }\n}\n```\n\n## Development\n\nTo install dependencies:\n\n```bash\nnpm install\n```\n\nTo build (includes both Core and WebUI):\n\n```bash\nnpm run build\n```\n\nTo run locally:\n\n```bash\nnpm start\n```\n\nTo run WebUI in development mode:\n\n```bash\nnpm run dev:webui\n```\n","readmeFilename":"README.md"}