Skip to content

testing the git stuff #7

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

testing the git stuff #7

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
03595e1
deleted additional files bc I started late, recreated readme file, da…
mahathi-m Jul 27, 2021
a79d804
creating a conflict
mahathi-m Jul 27, 2021
8727dde
real conflict
mahathi-m Jul 27, 2021
6347646
4th try
mahathi-m Jul 27, 2021
e45ff2f
Merge pull request #2 from mahathi-m/rewrite-about
mahathi-m Jul 27, 2021
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
10 changes: 4 additions & 6 deletions day14/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
This is a "readme" file that usually denotes the starting place to get a grasp on the purpose of a project or subfolder.
Mahathi just created a new file in day14. Testing testing!

Hi!
I am trying to create a conflictthis is bad conflic editing the same line ! yayy t

We will be making edits to this file as well as creating new ones, in the hopes of demonstrating the power and nuances of git and VCSs.

Edit from Shirley

Baguettes are my favorite type of bread. I had one as a snack with olive oil. It was yummy!
Empty file removed day14/hi.txt
View file
Open in desktop
Empty file.