Git version control tool used: Error pulling origin:error:Your local changes to the following files would is overwritten by merge

Excerpted from: CSDN Inverse cheers

Git in pull, when this error occurs, many people may enter the stash, related stash see: Error pulling Origin:error:Your local changes to the following files would be overwritten by merge

But after discovering stash still appears: Error pulling origin:error:The following untracked working tree files would be overwritten by merge ...

In fact, you see the error hints, it is because some untracked working tree files caused problems. So as long as the solution of these untracked files can solve this problem.

There are two ways to resolve this:

One way: If you have a Git tool, of course, a graphical tool, such as tortoisegit, you can use these tools to select your project folder, right-click cleanup.

Way two: Through the command line, you directly execute git clean-d-fx can. Maybe a lot of people don't understand what-d,-fx really mean, the next article on git will introduce git clean-related things.