Skip to content

gitGraph: merge commit improvment #5154

Closed
@macherel

Description

@macherel

Description

Some merge commits are not displayed properly.

Steps to reproduce

Create a merge commit with gitGraph.
The graph is not displayed properly.

Screenshots

merge commit

Code Sample

gitGraph LR:
  commit

  branch branch-A
  commit
  merge main

  checkout main
  commit
  checkout branch-A
  merge main
gitGraph LR:
  commit

  branch branch-A
  commit
  merge main

  checkout main
  commit
  checkout branch-A
  merge main
Loading
gitGraph LR:
  commit

  branch branch-A
  branch branch-B
  commit

  checkout branch-A
  merge branch-B

  checkout branch-B
  merge branch-A
gitGraph LR:
  commit

  branch branch-A
  branch branch-B
  commit

  checkout branch-A
  merge branch-B

  checkout branch-B
  merge branch-A
Loading
gitGraph LR:
  commit

  branch branch-B order: 2
  commit

  branch branch-A
  merge main

  checkout branch-B
  merge branch-A
gitGraph LR:
  commit

  branch branch-B order: 2
  commit

  branch branch-A
  merge main

  checkout branch-B
  merge branch-A
Loading

Setup

  • Mermaid version: latest develop
  • Browser and Version: [Chrome, Edge, Firefox]

Suggested Solutions

Proposal made in the PR #5152

Additional Context

No response

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    Status: TriageNeeds to be verified, categorized, etcType: Bug / ErrorSomething isn't working or is incorrect

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions