I am working on a project with another person, and we have a bitbucket repository where we are doing the commits, but it turns out that we have a problem, I can not update the code that he modifies on his machine and he can not update the code. that I modify in my machine, when I click the option pull I get the following error
Git Pull Failed
Your local changes would be overwritten by merge. Commit, stash or revert them to proceed. View them