When I commit (I click on the top panel "Vcs" I select some files in which I made changes) immediately when the window opens, the following error occurs

enter image description here

Someone faced with a similar problem?

If you’ve been running, you’ll be able to see the error message: fatal: multiple stage entries for merged file / src during executing git -c core.quotepath = false status —porcelain -z —untracked-files = no -

I found something similar here, but I didn’t want to add all my files, then make comets, but I took a chance, after the git add command -A knocked out the following:

warning: CRLF will be replaced by LF in gradlew.bat. The line will have its original line endings in your working directory.

  • 2
    Picture questions are not welcome here. - Pavel Mayorov
  • did you try to google a mistake? - Vladyslav Matviienko
  • It will be much better if you consistently (I do this, then that) describe the process as a result of which you get an error and provide the text of the error and not the photo - Bald
  • Remove .git/index , so try the steps in idea - Komdosh
  • @Komdosh delete in the folder itself or through the terminal? can be a little more detail. - Inkognito

1 answer 1

About

You can see the error message: fatal: multiple stage entries for merged file

If you have Windows, I assume that the matter may be that at some stage you have changed the case of characters in the name of some file / folder - such as test.txt and Test.txt. Windows assumes that the names of these files are the same.

I think I could help you interactively. I’m not sure whether it is possible to publish my contact information here - whether it will break the rules. If possible - I will write how to contact me, we will understand and fix the result here.

And about

warning: CRLF will be replaced by LF

There is nothing wrong with it and the commit should still occur. This is just a message stating that in the file gradlew.bat you have the end of the CRLF lines, and according to your settings ( git config core.autocrlf ) git will replace them with LF at commit.

  • Думаю, что я мог бы вам помочь в интерактивном режиме - in principle, no one forbids. But it is better to come up with a non-interactive solution and describe it in the answer. So you will help not one person, but hundreds. :) - Nick Volynkin ♦
  • So for the help of hundreds, I propose to publish a solution to which we will come. Anyway, you can contact me via this link (valid day): discord.gg/By56M - Ovsyanka