Skip to content

conflict is coming #10

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
SadiqOnGithub wants to merge 3 commits into
base: main
Choose a base branch
from
Open

conflict is coming #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ea7c35
conflict is coming
SadiqOnGithub Sep 15, 2025
f91bc7c
Merge branch 'main' into SadiqOnGihub/conflict
ErArman13 Sep 15, 2025
65d19a8
Merge branch 'main' into SadiqOnGihub/conflict
ErArman13 Sep 16, 2025
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
1 change: 1 addition & 0 deletions USERNAME.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# This is a new combined line to resolve the conflict.
and it created conflict while merging main into feature branch
this will definetly create some conflict!
let's try this with a end line