From 0110936f3241febfb3ba6cbf79de138c7b31b248 Mon Sep 17 00:00:00 2001 From: Cyanoure Date: Sun, 15 Sep 2024 16:41:35 +0200 Subject: [PATCH 1/2] Test --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index c17cb19..9e09de4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,7 +1,7 @@ import test from "./test"; export function startTest() { - console.log("Hello, World!"); + console.log("Hello, World?"); let i: number = 0; setInterval(() => { i++; -- 2.49.0 From 2990d65a6342e02c9f9c5ca636ec09c5dae0896d Mon Sep 17 00:00:00 2001 From: Cyanoure Date: Sun, 15 Sep 2024 16:42:17 +0200 Subject: [PATCH 2/2] Actions: Revert revert git merge command --- .github/workflows/Build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 7442593..ecd30dd 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -32,7 +32,7 @@ jobs: BRANCH_NAME="${GITHUB_REF_NAME}-build" git fetch origin $BRANCH_NAME || true # Allow failure if branch doesn't exist git switch $BRANCH_NAME || git switch -c $BRANCH_NAME - git merge --no-ff ${GITHUB_REF_NAME} + git merge --allow-unrelated-histories ${GITHUB_REF_NAME} rm -rf dist # Install dependencies -- 2.49.0