search

git-up / GitUp

The Git interface you've been missing all your life has finally arrived.
http://gitup.co
GNU General Public License v3.0
11.51k stars 1.27k forks source link

Error during Rebase: "Operation results in merge conflicts and repository must be clean to resolve them" #925

Closed pietermuller closed 1 year ago

pietermuller commented 1 year ago

Reproducible with GitUp 1.3.3 - 1.3.5. Works on GitUp 1.3.2.

Steps:

  1. I am rebasing a feature branch with many commits onto the master branch with "Rebase Current Branch onto here...".
  2. Somewhere in an intermediate commit I fix up a merge conflict.
  3. After fixing up and clicking Continue, a red error banner is displayed shortly:

    Operation results in merge conflicts and repository must be clean to resolve them

  4. The rebase aborts, and the working directory is left with some intermediate changes.
  5. (To recover to the original state, I discard these changes.)

If I go back to GitUp 1.3.2 the exact same rebase works.

Unfortunately I do not have a simple sample repo to reproduce this.

pietermuller commented 1 year ago

Duplicate. This seems to be a duplicate of https://github.com/git-up/GitUp/issues/882.

I can reproduce the issue on GitUp 1.3.5 using the repo attached at #882: https://github.com/git-up/GitUp/files/11054142/gitup-rebase-issue.zip