Skip to content

merging #3

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

merging #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
171abe3
Added text file
marshakprograms Oct 4, 2022
d7f5e5d
Update index.txt
marshakprograms Oct 4, 2022
ba63930
updated text
marshakprograms Oct 4, 2022
50a2516
merge issue
marshakprograms Oct 4, 2022
900eccb
trying to fix
marshakprograms Oct 4, 2022
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# git-example
An example repo to demonstrate using git

Marsha has made her changes to this REAMME doc
5 changes: 5 additions & 0 deletions index.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<<<<<<< HEAD
Now I am making even more changes
=======
Making some changes in the file on GitHub
>>>>>>> d7f5e5d4a3d31e29d753aae8cfaa152a6c9ed73c