使用不同的 node_modules 文件夹进行 git checkout

Question

I have two branches, one called "gh-pages" and the other "master" branch. Both are having separate folders like "node_modules", but they are completely different. And they are untracked!

So when checking out eg the "gh-pages" branch as follows

git checkout gh-pages

I need a way to specify that Git should not just remove (but save) all tracked, but also all untracked files and folders (like the "node_modules" folder) from the "master" branch. And then load all tracked files and folders from the "gh-pages" branch and as well as all untracked files and folders.

Is there a simple way or do I really need to remove untracked files and folders for each checkout so that the two do not come into the cross?

Answer 1

I have two branches, one called "gh-pages" and the other "master" branch. Both are having separate folders like "node_modules", but they are completely different. And they are untracked!

So when checking out eg the "gh-pages" branch as follows

git checkout gh-pages

I need a way to specify that Git should not just remove (but save) all tracked, but also all untracked files and folders (like the "node_modules" folder) from the "master" branch. And then load all tracked files and folders from the "gh-pages" branch and as well as all untracked files and folders.

Is there a simple way or do I really need to remove untracked files and folders for each checkout so that the two do not come into the cross?

Answer 2

I have two branches, one called "gh-pages" and the other "master" branch. Both are having separate folders like "node_modules", but they are completely different. And they are untracked!

So when checking out eg the "gh-pages" branch as follows

git checkout gh-pages

I need a way to specify that Git should not just remove (but save) all tracked, but also all untracked files and folders (like the "node_modules" folder) from the "master" branch. And then load all tracked files and folders from the "gh-pages" branch and as well as all untracked files and folders.

Is there a simple way or do I really need to remove untracked files and folders for each checkout so that the two do not come into the cross?

Answer 3

I have two branches, one called "gh-pages" and the other "master" branch. Both are having separate folders like "node_modules", but they are completely different. And they are untracked!

So when checking out eg the "gh-pages" branch as follows

git checkout gh-pages

I need a way to specify that Git should not just remove (but save) all tracked, but also all untracked files and folders (like the "node_modules" folder) from the "master" branch. And then load all tracked files and folders from the "gh-pages" branch and as well as all untracked files and folders.

Is there a simple way or do I really need to remove untracked files and folders for each checkout so that the two do not come into the cross?

Answer 4

I'm having a similar problem as well as this can also be an issue when upgrading the dependencies listed in the package.json (another branch may still have the old package.json in which case modules in node_modules could be at the wrong versions after switching branches).

One of my ideas is to setup a local git checkout hook which runs npm ci every time I switch/checkout different branches or commits. This requires having/using and tracking/committing a package-lock.json however, plus (re)installing might take too long on bigger projects (in which case you may want to try something like pnpm in order to speed up installs).

Another idea is to simply use yarn v2 and then commit all of your dependencies/modules (which I believe yarn stores locally in what it calls its cache ). Also, I could be wrong but I believe you can also run npm ls and it will error if node_modules does not match the project/package manifests (not sure if this is well-documented however, nor do I know much about the finer details of what it does and doesn't verify).