Skip to content

conflict resolution #8

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
Sadhna263 wants to merge 4 commits into
base: Sample-branch
Choose a base branch
from
+2 −0
Open

conflict resolution #8

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df7b12d
Merge pull request #7 from Sadhna263/Sample-branch
Sadhna263 Apr 5, 2026
b158aa1
Fix grammatical error in file.txt
Sadhna263 Apr 5, 2026
0353139
Add conflict resolution details to file.txt
Sadhna263 Apr 5, 2026
3845f43
Merge branch 'Sample-branch' into main
Sadhna263 Apr 5, 2026
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
2 changes: 2 additions & 0 deletions file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@ There changes are to learn that how to resolve conflicts.
These are the changes in the sample branch so that later we can merge it with the main branch.
These are the changes in the main branch so that we can learn how to resolve it.
CONFLICT RESOLUTION:
the changes is made into sample file
the change is made into Sample File
the changes are made into Sample File