"Cannot rebase onto multiple branches."

[AndrewSav]

Every now and then, when I pull I'm getting a error message "cannot rebase onto multiple branches". It happens a couple of times per day. Pulling again usually does not produce the error and pulls successfully. What could be the reason? This is not something I can reproduce at will, it seems to happen randomly and regularly. 0.42

[stefanhaller]

Interesting, this should have been fixed in v0.41 (see 76e39af).

Which git version are you using? The above-mentioned fix requires git 2.29 or later.

If it's not that, the only other explanation for me is that you have some other app running that periodically auto-fetches in the background (some IDEs do this by default), and doesn't use the --no-write-fetch-head option like we do. If you can identify which program does this, see if it has an option to turn this off.

[AndrewSav]

2.34.1

[AndrewSav]

If it's not that, the only other explanation for me is that you have some other app running that periodically auto-fetches in the background

Unlikely. Another datapoint this is usually happens during the first pull in the morning, that is when I have not used the computer for a few hours. It never happened before 0.42, or shortly before that time if there were a few releases in rapid succession. I'm a long time user, this was introduced relatively recently

[AndrewSav]

Is there anything I can do to help diagnosing?

[stefanhaller]

Then I'm out of ideas I'm afraid.

You could run lazygit with the -d option (it tells it to log a lot of stuff to a debug log); then, when it happens again, post the log here. (Use lazygit -l to see where the log is. The output of lazygit -l itself is probably not enough unless it was running all the time.)

I can't promise we'll be able to see anything from the log, but it may be worth a shot.

[eerison]

it would be nice if we could rebase multiple branches

[stefanhaller]

This seems very unrelated to the error message we're talking about here. Sounds more like an enhancement request; if you feel strongly about it, please open a new issue for it. If you do, please describe the use case that you would use it for, it's rather unclear to me.

[AndrewSav]

Just to update, I'm still having this issue on 0.45. Every morning the first pull produce this error and then no errors on repeat. This hints that if you try to pull when a fetch is ongoing, you will get this error. I think what's happeing is that I'm pulling during this background fetch, which is not properly syncronized, which results in this issue.

This also seems relevant because I do indeed always have [pull] rebase=true in my globlal .gitconfig

[jesseduffield]

I also have that same git config option applied, but I can't reproduce locally. I've increased the rate of background fetches by adding this to my lazygit config:

refresher:
    fetchInterval: 1

But I can't get an error to occur if I spam the pull action