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 + +