marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-08-29 21:26:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update packages/mermaid/src/diagrams/git/gitGraphAst.ts

Browse Source 
Co-authored-by: Sidharth Vinod <github@sidharth.dev>
This commit is contained in:
Austin-Fulbright
2024-07-27 04:03:25 -04:00
committed by GitHub
parent 871f0478c6
commit 6e5e5f9c61
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/mermaid/src/diagrams/git/gitGraphAst.ts
View File

@@ -215,16 +215,6 @@ export const merge = (
throw error; throw error;
} }
// if (isReachableFrom(currentCommit, otherCommit)) {
// log.debug('Already merged');
// return;
// }
// if (isFastForwardable(currentCommit, otherCommit)) {
// branches.set(curBranch, branches.get(otherBranch));
// head = commits.get(branches.get(curBranch));
// } else {
// create merge commit
const verifiedBranch: string = otherBranchCheck ? otherBranchCheck : ''; //figure out a cleaner way to do this const verifiedBranch: string = otherBranchCheck ? otherBranchCheck : ''; //figure out a cleaner way to do this
const commit: Commit = { const commit: Commit = {