Skip to content

Gitgraph merge #3915

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

Open
Luke-Guangzhong opened this issue Dec 15, 2022 · 1 comment
Open

Gitgraph merge #3915

Luke-Guangzhong opened this issue Dec 15, 2022 · 1 comment
Labels
Status: Triage Needs to be verified, categorized, etc Type: Bug / Error Something isn't working or is incorrect

Comments

@Luke-Guangzhong
Copy link

Description

Please pay attention to the part that I box in red.

Steps to reproduce

I merge a branch into the blue one.

Screenshots

image
image

Code Sample

%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {
	'rotateCommitLabel': false,
	'showBranches': true,
	'showCommitLabel':true,
	'mainBranchName': 'master'}} }%%
gitGraph
	commit id:"320670f" tag:"1.10.2"
	branch HCD-25 order:6
	
	checkout HCD-25
	commit id:"81c6559" type:HIGHLIGHT
	
	checkout master
	branch format order:1
	
	checkout format
	commit id:"27d84bc"
	
	checkout master
	merge format id:"829a9d7"
	branch HCD-26 order:7
	
	checkout HCD-26
	commit id:"e6f3687"
	branch OTB-06 order:8
	
	checkout OTB-06
	commit id:"583d951"
	
	checkout master
	branch HCN-1734 order:4
	
	checkout HCN-1734
	commit id:"5290b9f"
	
	checkout master
	branch HCA-238 order:3
	
	checkout HCA-238
	commit id:"7db2af7"
	
	checkout master
	branch HCD-41 order:9
	
	checkout HCD-41
	commit id:"a5a8d99"
	
	checkout master
	branch HCD-Develop order:5
	
	checkout HCD-Develop

	
	checkout OTB-06
	commit id:"77da280"
	
	checkout master
	branch develop order:2
	
	checkout develop
	merge HCA-238 id:"8046b8c"
	merge HCN-1734 id:"2664d06"
	
	checkout HCD-41
	commit id:"b3bf3d7"
	
	checkout HCD-Develop
	merge OTB-06 id:"64e1bc0" tag:"HNT"
	commit id:"84cbbb1"
	
	checkout develop
	merge HCD-Develop id:"73fa84f"

Setup

Desktop

  • OS and Version: [Windows,9.3.0]

Additional Context

No response

@Luke-Guangzhong Luke-Guangzhong added Status: Triage Needs to be verified, categorized, etc Type: Bug / Error Something isn't working or is incorrect labels Dec 15, 2022
@danieltatrai
Copy link

Tried to use mermaid under gitlab, noticed this as well, and it triggered me as hell. Tried to understand and bypass it by juggling the merge order or something, but no luck.
Also seeing this issue is old makes me sad.

@jgreywolf jgreywolf added roadmap items to add to roadmap for auto workflow and removed roadmap items to add to roadmap for auto workflow labels Nov 16, 2023
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

3 participants