How to fix folder/file.py: needs merge error when doing git stash save?

Question

git

Hello! I need to merge on a server shared by other developers. When trying to merge, a conflict arose and it was agreed that I would make a git stash, just in case. Because whose files are in conflict is not in place.

When I try to run git stash save "my message"I get an error folder/file.py: needs merge

. What commands should I use in this case so as not to lose any data? Changes could be made directly to the files on the server...

Thank you.

Answer 1

git merge --abort
Then stash and then try to merge your changes again.
For peace of mind, you can first make a backup copy of the current state of the repository directory.