Do a Git pull to overwrite local changes
问题 There has certainly been posts around for this, but I actually did a commit because I thought it was the right thing to do. So, I have two repositories, one development and one production. I had to edit something in the production because it was an urgent bugfix, and now I have three files that are newer in the production than in the development. I committed the three files on the production and tried a pull, but it told me there were merge errors. I tried copying and pasting the new files to