A file is deleted from branch1 and present in branch2. Unable to switch branch from branch2.

Question

The file is still present in branch2, now when I try to switch from branch2 to branch1, sourcetree is giving me error -

'Your local changes to the following files would be overwritten by checkout'

Why is sourcetree not able to treat the file as deleted.

Any steps to resolve this or any steps I am doing incorrectly?

Hana Kučerová · Answer

@DipakP , please, when you go the File status, what you are able to see in Staged files and Unstaged files sections?

DipakP · Answer

I have committed the changes to branch1.

There are no non-committed changes in branch2.

Hana Kučerová · Answer

Hi @DipakP ,

welcome to the Atlassian Community!

How exactly did you delete the file from branch1? Did you commit this change back to branch1?

I think you get this error message because there are some non-commited changes now.