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

Co-authored-by: Sidharth Vinod <github@sidharth.dev>
mermaid-js · Jul 27, 2024 · 6e5e5f9 · 6e5e5f9
1 parent 871f047
commit 6e5e5f9
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/packages/mermaid/src/diagrams/git/gitGraphAst.ts b/packages/mermaid/src/diagrams/git/gitGraphAst.ts
@@ -215,16 +215,6 @@ export const merge = (
     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 commit: Commit = {