Skip to content

changes by me #94

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
himanshu951 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

changes by me #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b30e1a6
changes by me
Jan 11, 2023
76d1c60
Merge branch 'master' into master
himanshu951 Jan 11, 2023
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 file1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
file 1 is added
adding more code


vuhwvhf okmpg3ng ;ihtg

ghfjdt

this is a change to file
=======
learning merge conflict

8 changes: 8 additions & 0 deletions file2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,12 @@
i am in branch1
trying merging branch


I am a change
Trying to make a change


this is a change to file2
=======
Suchi di's file