-
Notifications
You must be signed in to change notification settings - Fork 9.8k
Closed
Labels
bugConfirmed bugs or reports that are very likely to be bugsConfirmed bugs or reports that are very likely to be bugsinvestigation-neededLikely bugs, but haven't been reliably reproduced by a reviewerLikely bugs, but haven't been reliably reproduced by a reviewerpriority-3Bugs that affect small number of users and/or relatively cosmetic in natureBugs that affect small number of users and/or relatively cosmetic in nature
Description
The problem
Hello,
I’ve noticed some odd behavior with branch merging recently, and it seems that the behavior differs depending on whether the branch is remote or local. I’d like to request a review of this issue.
I’ve attached some screenshots for reference:
Screenshot 1 | Screenshot 2 |
---|---|
Merging origin/main into branch b , shows up-to-date. |
Merging the local branch main into branch b , shows 11 commits, which shouldn’t exist. |
Screenshot 3 | Screenshot 4 |
---|---|
Merging branch b into branch c , inconsistent behavior observed. |
Another example of merging branch b into branch c . |
This doesn’t seem to happen consistently, but to help with testing, I’ve shared the repository I used for testing:
https://github.com/zeikar/merge-test.
Thank you!
Release version
3.4.10-beta3 (arm64)
Operating system
macOS 15.1.1 (24B91)
Steps to reproduce the behavior
- Create a new repository.
- Create a new branch.
- Test merging between the local branch and the remote branch.
Log files
No response
Screenshots
No response
Additional context
It seems to work correctly after restarting the application.
Metadata
Metadata
Assignees
Labels
bugConfirmed bugs or reports that are very likely to be bugsConfirmed bugs or reports that are very likely to be bugsinvestigation-neededLikely bugs, but haven't been reliably reproduced by a reviewerLikely bugs, but haven't been reliably reproduced by a reviewerpriority-3Bugs that affect small number of users and/or relatively cosmetic in natureBugs that affect small number of users and/or relatively cosmetic in nature