Skip to content

Branch Merge Results Differ Between Remote and Local #19710

@zeikar

Description

@zeikar

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
image image
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
image image
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

  1. Create a new repository.
  2. Create a new branch.
  3. 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

No one assigned

    Labels

    bugConfirmed bugs or reports that are very likely to be bugsinvestigation-neededLikely bugs, but haven't been reliably reproduced by a reviewerpriority-3Bugs that affect small number of users and/or relatively cosmetic in nature

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions