Rebase succeeds but working dir is left dirty and error “Local changes would be overwritten by checkout” pops up

[ghost]

I’m using 1.3.5 on an M1 Mac running MacOS 12.6.3.

This has happened for me multiple times over the past few weeks — I’m not sure exactly when it started — with multiple repos.

I’ll be working on a feature branch that has conflicts with main so I’ll want to rebase my feature branch on main.

Once I resolve the conflict, the rebase seems to succeed just fine, but an error message pops up: Local changes would be overwritten by checkout and when I dismiss that and switch to the Commit View, there’s a ton of files that seem to be changed — some staged, some not.

Here are some screenshots:

I start clean on my feature branch with no changes in the working dir:

I start the rebase, conflicts are reported:

I’ve resolved the conflicts:

I’ve just pressed Commit:

I dismiss the error, and the branch looks like it rebased as expected; it looks good:

I switch to Commit View and there are many unexpected changes in the wd:

I’ve found that I can just discard all of these changes without losing anything I need.

So, I can work around this, but it’s annoying and disconcerting.

---

I have no idea what’s going on here. Any chance I’m doing something wrong? Is there anything I could do to help debug this?

[lucasderraugh]

Potentially related to #882. If you have an easy repro case I can go through I'd like to debug it, but I haven't found resolving conflicts on merges or rebases to trigger an issue. I'm sure the issue exists, but having a reproducible way to hit it would be extremely helpful.

[ghost]

Thanks, I’ll see what I can do.

[balavor]

Got the same issue. Rebasing a branch where few commit have conflicts, after resolving the first commit, the whole operation gets canceled with the error, and all files are left in the repo as new.

[soberman]

Yep, I experience the same issue.

[NikKovIos]

@lucasderraugh the same thing with every merge. Steps:

1) Branch A from master. 2) master have changes. 3) Branch master merge into A. Conflicts occured. 4) After resolve conflicts and press merge the error occured. "Local changes would be overwritten by checkout"

[DanielRouxSA]

I'm encountering this issue with merging as well.

[NikKovIos]

Up. Very annoying (

[balavor]

Same thing for like a half year or more :(

[mluisbrown]

I also have the same issue for months, to the point where I only ever do rebases with the git CLI now 😞 Merges in GitUp are still ok though.

[breathe]

I'm having the same issue as well -- with some but not all rebase's

• Branch A from main
• main has changes with some conflicts to A
• rebase A onto main
• get the resolve conflicts view -- resolve the conflicts and hit 'commit'
• commit succeeds but I get error “Local changes would be overwritten by checkout” and a bunch of files which I didn't edit are now dirty in the working directory ...

After unstaging and and discarding all the edits in the working directory -- I seem to be in the expected state ...

[breathe]

@lucasderraugh was anyone able to supply you with a repro scenario for this ?

[lucasderraugh]

@breathe Looks like there are many repro steps here. I haven't had the chance to debug it yet. Going to push out latest GitUp to the stable channel today and then I'll try to make the next release a focus on fixing up some of these libgit2 fallout changes.

[balavor]

@lucasderraugh a common way I can reproduce the issue is to rebase branch A on branch B, where branch A has 2 commits, and each of them requires resolving conflicts in the same file.

After resolving conflicts in a first commit, when it gets to the second one, the entire rebase fails with an error "Local changes would be overwritten by checkout". However, if you delete the last commit from A and perform the rebase again, the rebase will succeed, but it would also have an error displayed.