From ac6c8901b02b99d62c619592c17ea6ffef30b67e Mon Sep 17 00:00:00 2001 From: Johan_Trieloff Date: Sun, 31 Dec 2023 16:21:30 +0100 Subject: [PATCH 1/5] changed on main --- blocks/test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/blocks/test.js b/blocks/test.js index be4e890..cd404b9 100644 --- a/blocks/test.js +++ b/blocks/test.js @@ -21,4 +21,5 @@ function createdOnMainAndChangedAfterWithMerge() { console.log('This creates the function on main branch') console.log('First change on test branch') console.log('Second change on test branch') + console.log('Changed on main branch') } \ No newline at end of file From d1da959a1daabad0b1e2ba13889f09b7d11b2a40 Mon Sep 17 00:00:00 2001 From: Johan_Trieloff Date: Sun, 31 Dec 2023 16:24:36 +0100 Subject: [PATCH 2/5] create function --- blocks/test.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/blocks/test.js b/blocks/test.js index cd404b9..76ce460 100644 --- a/blocks/test.js +++ b/blocks/test.js @@ -22,4 +22,8 @@ function createdOnMainAndChangedAfterWithMerge() { console.log('First change on test branch') console.log('Second change on test branch') console.log('Changed on main branch') +} + +function test_changedAfterMergeWithMerge() { + console.log('This creates the function') } \ No newline at end of file From de8368bab5d033a5ea48d1b867eba9024d437709 Mon Sep 17 00:00:00 2001 From: Johan_Trieloff Date: Sun, 31 Dec 2023 16:24:56 +0100 Subject: [PATCH 3/5] change again --- blocks/test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/blocks/test.js b/blocks/test.js index 76ce460..c3a30f6 100644 --- a/blocks/test.js +++ b/blocks/test.js @@ -26,4 +26,5 @@ function createdOnMainAndChangedAfterWithMerge() { function test_changedAfterMergeWithMerge() { console.log('This creates the function') + console.log('Second change on test branch') } \ No newline at end of file From 95ef988e3183dfef0fe112c4d081846a1d991b9d Mon Sep 17 00:00:00 2001 From: Johan_Trieloff Date: Sun, 31 Dec 2023 16:25:51 +0100 Subject: [PATCH 4/5] changed again --- blocks/test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/blocks/test.js b/blocks/test.js index c3a30f6..70dc9d2 100644 --- a/blocks/test.js +++ b/blocks/test.js @@ -27,4 +27,5 @@ function createdOnMainAndChangedAfterWithMerge() { function test_changedAfterMergeWithMerge() { console.log('This creates the function') console.log('Second change on test branch') + console.log('Changed again on another branch') } \ No newline at end of file From ecd4cd13dfdc2ba03d2e9d2391c523b750e7d454 Mon Sep 17 00:00:00 2001 From: Johan_Trieloff Date: Sun, 31 Dec 2023 16:26:15 +0100 Subject: [PATCH 5/5] second change --- blocks/test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/blocks/test.js b/blocks/test.js index 70dc9d2..0ab99ba 100644 --- a/blocks/test.js +++ b/blocks/test.js @@ -28,4 +28,5 @@ function test_changedAfterMergeWithMerge() { console.log('This creates the function') console.log('Second change on test branch') console.log('Changed again on another branch') + console.log('Changed second time on another branch') } \ No newline at end of file