Skip to content

Commit hash color incorrect after merge with main #3796

@dotslashdan

Description

@dotslashdan

Describe the bug
When merging with main, while having un-merged (with main) commits, the un-merged commits become green, indicating the commit has been merged in

To Reproduce
Steps to reproduce the behavior:

  1. Have branch out of date with main
  2. Have local commits pushed to origin
  3. Merge with main
  4. Local commits turn from yellow to green

Expected behavior
The local un-merged commits to remain yellow

Screenshots
image
image

Version info:
lazygit: commit=71ad3fac63a3ef3326021837b49e9497d332818b, build date=2024-07-13T10:24:19Z, build source=binaryRelease, version=0.43.1, os=darwin, arch=arm64, git version=2.46.0

git: git version 2.46.0

Metadata

Metadata

Assignees

No one assigned

    Labels

    bugSomething isn't working

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions