From b53eb84e723b59bb4963812c0be4ccf10dd2dc1d Mon Sep 17 00:00:00 2001
From: Dagim-Daniel <dagimdan19@gmail.com>
Date: Sat, 25 Jul 2026 11:38:22 +0100
Subject: [PATCH 1/2] split the app js into header.js and main.js file

---
 dom-merge-conflict/tasks/buttons-and-counter/src/header.js | 6 ++++++
 dom-merge-conflict/tasks/buttons-and-counter/src/main.js   | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 dom-merge-conflict/tasks/buttons-and-counter/src/header.js
 create mode 100644 dom-merge-conflict/tasks/buttons-and-counter/src/main.js

diff --git a/dom-merge-conflict/tasks/buttons-and-counter/src/header.js b/dom-merge-conflict/tasks/buttons-and-counter/src/header.js
new file mode 100644
index 0000000..0f0be02
--- /dev/null
+++ b/dom-merge-conflict/tasks/buttons-and-counter/src/header.js
@@ -0,0 +1,6 @@
+const header = document.createElement("header");
+header.innerHTML = `
+        <h1>Number Counter</h1>
+        <p>A simple counter. Press increment to increase the count by one.</p>
+    `;
+body.appendChild(header);
diff --git a/dom-merge-conflict/tasks/buttons-and-counter/src/main.js b/dom-merge-conflict/tasks/buttons-and-counter/src/main.js
new file mode 100644
index 0000000..5703951
--- /dev/null
+++ b/dom-merge-conflict/tasks/buttons-and-counter/src/main.js
@@ -0,0 +1,6 @@
+const main = document.createElement("main");
+main.innerHTML = `
+        <p id="counter" data-testid="counter">0</p>
+        <button id="increment">Increment</button>
+c    `;
+body.appendChild(main);

From 2ff377e098720a02f7f264f47a5b842e02ce4a40 Mon Sep 17 00:00:00 2001
From: Dagim-Daniel <dagimdan19@gmail.com>
Date: Sat, 25 Jul 2026 11:59:49 +0100
Subject: [PATCH 2/2] delete he header and main parts of the app.js

---
 .../tasks/buttons-and-counter/src/app.js           | 14 --------------
 .../tasks/buttons-and-counter/src/main.js          |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/dom-merge-conflict/tasks/buttons-and-counter/src/app.js b/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
index af608eb..32dc0b4 100644
--- a/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
+++ b/dom-merge-conflict/tasks/buttons-and-counter/src/app.js
@@ -7,20 +7,6 @@ function increment(node) {
 export function App() {
   const body = document.createElement("body");
 
-  const header = document.createElement("header");
-  header.innerHTML = `
-        <h1>Number Counter</h1>
-        <p>A simple counter. Press increment to increase the count by one.</p>
-    `;
-  body.appendChild(header);
-
-  const main = document.createElement("main");
-  main.innerHTML = `
-        <p id="counter" data-testid="counter">0</p>
-        <button id="increment">Increment</button>
-    `;
-  body.appendChild(main);
-
   const button = body.querySelector("#increment");
   const counter = body.querySelector("#counter");
   button.addEventListener("click", () => {
diff --git a/dom-merge-conflict/tasks/buttons-and-counter/src/main.js b/dom-merge-conflict/tasks/buttons-and-counter/src/main.js
index 5703951..23ffe50 100644
--- a/dom-merge-conflict/tasks/buttons-and-counter/src/main.js
+++ b/dom-merge-conflict/tasks/buttons-and-counter/src/main.js
@@ -2,5 +2,5 @@ const main = document.createElement("main");
 main.innerHTML = `
         <p id="counter" data-testid="counter">0</p>
         <button id="increment">Increment</button>
-c    `;
+    `;
 body.appendChild(main);