Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gitGraph: merge commit improvment #5154

Closed
macherel opened this issue Dec 19, 2023 · 0 comments
Closed

gitGraph: merge commit improvment #5154

macherel opened this issue Dec 19, 2023 · 0 comments
Labels
Status: Triage Needs to be verified, categorized, etc Type: Bug / Error Something isn't working or is incorrect

Comments

@macherel
Copy link
Contributor

macherel commented Dec 19, 2023

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

@macherel macherel added Status: Triage Needs to be verified, categorized, etc Type: Bug / Error Something isn't working or is incorrect labels Dec 19, 2023
@macherel macherel closed this as completed May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Triage Needs to be verified, categorized, etc Type: Bug / Error Something isn't working or is incorrect
Projects
None yet
Development

No branches or pull requests

1 participant