From 2f44a572a293a1094b0e102eeba1b5c3712e3911 Mon Sep 17 00:00:00 2001
From: Rafal Korszun <8030590+rkorszun@users.noreply.github.com>
Date: Tue, 17 Feb 2026 09:38:32 +0100
Subject: [PATCH] Add instructions for handling git conflicts

---
 zadanie.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/zadanie.txt b/zadanie.txt
index e69de29..9b9d0dd 100644
--- a/zadanie.txt
+++ b/zadanie.txt
@@ -0,0 +1,9 @@
+1. create new branch "conflicted" edit "zdanaie.txt" on that branch commit & don't push
+2. go back to main branch edit "zadanie.txt" on main branch commit & push to repository 
+3. fetch changes from origin 
+4. try merge origin main into local "confliced" branch 
+5. resolve conflict 
+6. push "conflicted branch to repository" 
+7. create pr from "conflicted" branch into "main" branch 
+
+