git pull https://github.com/remix-run/remix.git main
There will be a merge conflict, which needs to be resolved manually.
Frequently, these conflicts are regarding GitHub workflow files,
which were deleted in the vercel/remix repo. In this case,
those workflow files can be git rm'd again to resolve.
If there is a conflict within the source code (i.e. in the Remix
compiler) then the conflicts will need to be manually resolved.
Finally, before committing the resolved merge, ensure that the version
field in the "vercel-remix" package's package.json file matches that
of the "remix-dev" package. If the version needs to be updated, update
the Remix-related dependencies in the package.json file as well,
since Remix keeps them in sync.
Latest commit: https://github.com/remix-run/remix/commit/5954ad1520e921483fbe07f5995c6f9d92e7a37b
How to resolve
Pull from the upstream repo:
There will be a merge conflict, which needs to be resolved manually.
Frequently, these conflicts are regarding GitHub workflow files, which were deleted in the
vercel/remixrepo. In this case, those workflow files can begit rm'd again to resolve.If there is a conflict within the source code (i.e. in the Remix compiler) then the conflicts will need to be manually resolved.
Finally, before committing the resolved merge, ensure that the
versionfield in the "vercel-remix" package'spackage.jsonfile matches that of the "remix-dev" package. If the version needs to be updated, update the Remix-related dependencies in thepackage.jsonfile as well, since Remix keeps them in sync.