2 Commits

Author	SHA1	Message	Date
Janka Uryga	1bfe63a6d0	auto-enable errors.json merge driver (#83420) ... The merge driver for `errors.json` has been around for a while, and seems to work without issues. This PR enables it by default by installing it in `postinstall`(via the existing `git-configure.mjs` script which is invoked from there already) It also adds `scripts/merge-errors-json/uninstall` to temporarily disable it in case of issues. If the driver crashes, we'll also print instructions on how to disable it.	2025-09-04 18:08:47 +02:00
Steven	1662362d12	chore: fix postinstall when using tarball (#60443) ... The postinstall script was failing In the case when you download [a zip](https://codeload.github.com/vercel/next.js/zip/refs/heads/canary) of the repo. This PR fixes it so that `git config` can fail silently in that case when the repo is not using git. - Related to https://github.com/nodejs/citgm/pull/1044 Closes NEXT-2036	2024-01-09 17:37:49 -05:00