When i try to rebase my development branch of openhab-addons to the current main using the method from this post: https://community.openhab.org/t/rebase-your-code-or-how-to-fix-your-git-history-before-requesting-a-pull/129358
I get the following error message:
error: The following untracked working tree files would be overwritten by checkout:
Please move or remove them before you switch branches.
git status shows a clean branch with no changes.
If i just delete the DishwasherHandler.java from the file system, git wants me to commit a change before doing the rebase.
I am confused now because the error message shows the file as untracked, altough git wants a commit when i delete the file.
My Branch is NOT about the Miele Binding, so i basically just want to take over any changes there.
Can anybody help me out how to solve this ? Do i really need to delete the file on my branch and do a commit for it ?