Problem with choosing upstream branch

I am working in PyCharm Professional and every time i try to update from remote i get:

When i choose:

It updates. But if I press update again, error repeats (Cannot update).
Its also confusing that I have strange message: "Branches have diverged" and also 2 different squares: "Handswork backend" and "payments-bakcend"

"Handswork_backend" makes no sense, its just folder name in which there is payments-backend  is located.

 

What can posssibly solve the issue?

On any other project upstream branch is tracked automatically and there is no problem.

1

Hi,

Can you check how many remotes do you have under Git  | Manage Remotes and how many directories you have mapped in File | Settings | Version Control | Directory Mappings ? And can you share screenshots please? 

If you have 2, please remove the undesired ones from both manage remotes and Directory Mappings and try to update again and see if the behavior continues.

It seems you are using a multi-repository project by accident: 

https://www.jetbrains.com/help/idea/2023.2/manage-branches.html?utm_source=product&utm_medium=link&utm_campaign=IU&utm_content=2023.3#synchronous_branch_control

1

请先登录再写评论。