title: An Excel file prevents me to do interactive rebase in IntelliJ Idea
body: <p>I face a merge conflict when I would like to rebase the <code>develop</code> branch against my <code>feature</code> branch. I use IntelliJ Idea to execute individual Git commands. Let's say I have 3 pushed commits and I want to squash and rebase them using <code>--interactive</code> mode.</p>
  <p><a href="https://i.stack.imgur.com/8TaFZ.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/8TaFZ.png" alt="enter image description here" /></a></p>
  <p>I select all three commits, I select <code>squash</code>, do some rewording, and hit <code>Rebase</code>.</p>
  <p><a href="https://i.stack.imgur.com/fDpAo.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/fDpAo.png" alt="enter image description here" /></a></p>
  <p>The process fails and an Excel file that appears in the Git panel among <em>Changes</em> and on the diff panel, says the contents are the same. I can only abort or retry the rebase, but continuing doesn't make sense as the change always prevents me to continue.</p>
  <p><a href="https://i.stack.imgur.com/O8gMu.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/O8gMu.png" alt="enter image description here" /></a></p>
  <p>Here is the console output:</p>
  <pre><code>12:50:42.385: [myapplication] git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= rebase --interactive develop
  Rebasing (1/2)
  error: Your local changes to the following files would be overwritten by merge:
      excel-file.xlsx
  Please commit your changes or stash them before you merge.
  Aborting
  hint: Could not execute the todo command
  hint: 
  hint:     fixup 37d1fc57dff9c7e9a312c88cf78c176cb71dbb47 CommitMessageIsHere
  hint: 
  hint: It has been rescheduled; To edit the command before continuing, please
  hint: edit the todo list first:
  hint: 
  hint:     git rebase --edit-todo
  hint:     git rebase --continue
  Could not apply 37d1fc5... CommitMessageIsHere
  </code></pre>
  <p>Is there a trick to overcome this obstacle? Is possible to somehow <em>force</em> ignoring and skipping such merge conflict?</p>