Background: (from memory) Branch A had a file X added to it Branch B had a copy of the file X added to it (in a different location) Later, Branch B was merged to branch A Steps: 1. git checkout A No local changes 2. git checkout B File X is deleted What did you expect to happen? (Expected behavior) Checking out a branch should not introduce local changes What happened instead? (Actual behavior) Checking out branch B introduced a local change, deleting File X Additional information: Switching back from branch B to branch A results in no local changes [System Info] git version: git version 2.29.2.windows.2 cpu: x86_64 built from commit: 3464b98ce6803c98bf8fb34390cd150d66e4a0d3 sizeof-long: 4 sizeof-size_t: 8 shell-path: /bin/sh uname: Windows 6.1 7601 compiler info: gnuc: 10.2 libc info: no libc information available $SHELL (typically, interactive shell): C:\Program Files\Git\usr\bin\bash.exe [Enabled Hooks] pre-commit pre-push The information contained in this email and its attachments may be confidential. If you have received this email in error, please notify the sender by return email, delete this email and destroy any copy. Any advice contained in this email has been prepared without taking into account your objectives, financial situation or needs. Before acting on any advice in this email, National Australia Bank Limited (NAB) recommends that you consider whether it is appropriate for your circumstances. If this email contains reference to any financial products, NAB recommends you consider the Product Disclosure Statement (PDS) or other disclosure document available from NAB, before making any decisions regarding any products. If this email contains any promotional content that you do not wish to receive, please reply to the original sender and write "Don't email promotional material" in the subject.
