# Problem during rebase

**URL:** <https://community.openhab.org/t/problem-during-rebase/143149>\
**Category:** Development\
**Tags:** git\
**Created:** [January 8, 2023, 11:35pm UTC](https://community.openhab.org/t/problem-during-rebase/143149 "2023-01-08T23:35:54Z")\
**Posts on this page:** 4\
**Page:** 1

<div class="post-metadata">

**Author:** ![FordPrfkt](https://community.openhab.org/user_avatar/community.openhab.org/fordprfkt/32/96810_2.png) [@FordPrfkt](https://community.openhab.org/u/FordPrfkt)\
**Post date:** [January 8, 2023, 11:35pm UTC](https://community.openhab.org/t/problem-during-rebase/143149/1 "2023-01-08T23:35:54Z")

</div>

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](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:

```auto
error: The following untracked working tree files would be overwritten by checkout:
        bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/DishwasherHandler.java
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 ?

---

<div class="post-metadata">

**Author:** ![mhilbush](https://community.openhab.org/user_avatar/community.openhab.org/mhilbush/32/56108_2.png) [@mhilbush](https://community.openhab.org/u/mhilbush)\
**Post date:** [January 9, 2023, 2:13am UTC](https://community.openhab.org/t/problem-during-rebase/143149/2 "2023-01-09T02:13:42Z")

</div>

I ran into this the other day. The name of that file was changed recently, but it was only a change in the case. Are you on a Windows or Mac computer? If so, you need to tell git to be case insensitive.

Set it for the repo like this

```auto
git config core.ignorecase true

```

Or globally like this

```auto
git config --global core.ignorecase true

```

---

<div class="post-metadata">

**Author:** ![FordPrfkt](https://community.openhab.org/user_avatar/community.openhab.org/fordprfkt/32/96810_2.png) [@FordPrfkt](https://community.openhab.org/u/FordPrfkt)\
**Post date:** [January 9, 2023, 5:54am UTC](https://community.openhab.org/t/problem-during-rebase/143149/3 "2023-01-09T05:54:41Z")

</div>

That did it for me! Thank you!

---

<div class="post-metadata">

**Author:** ![system](https://community-openhab-org.s3-eu-central-1.amazonaws.com/original/2X/6/6a52f2ac5d00e4c7b50471a354b3a9221188be90.png) [@system](https://community.openhab.org/u/system)\
**Post date:** [February 19, 2023, 9:55pm UTC](https://community.openhab.org/t/problem-during-rebase/143149/4 "2023-02-19T21:55:34Z")

</div>

This topic was automatically closed 41 days after the last reply. New replies are no longer allowed.