There is a branch with local-only or remote and local commits. If someone else contributed to this branch, we will see the upstream commits (orange line).
If I click Integrate upstream, a local commit appears that duplicates the upstream, but the upstream commit stays. And if I click on the Integrate upstream button again, it will add another duplicated local commit.
Version
nightly/0.5.601
Operating System
Mac OS X
Distribution Method
dmg (Apple Silicon)
Describe the issue
There is a branch with local-only or remote and local commits. If someone else contributed to this branch, we will see the upstream commits (orange line).
If I click
Integrate upstream
, a local commit appears that duplicates the upstream, but the upstream commit stays. And if I click on theIntegrate upstream
button again, it will add another duplicated local commit.Here is a video capture:
https://github.com/user-attachments/assets/11c57d37-a029-48e2-8788-b4116b1ad573
How to reproduce
update
button. You should see now the upstream commits (orange line).Integrate upstream
option on the button dropdown.Expected behavior
To me, the expected behavior would be to see the upstream commits after integration as local and remote commits (grey line).
See the video capture:
https://github.com/user-attachments/assets/6a579603-5654-4615-889f-175f449e6c54
cc @Caleb-T-Owens
Relevant log output
No response