Skip to content

Add instructions for handling git conflicts #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rkorszun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add instructions for handling git conflicts #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions zadanie.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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