Skip to content
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

Update Readme Local #27

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update Readme Local #27

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb9cfe2
Update Readme Local
S-Maxwell Feb 1, 2024
43bf09c
Merge branch 'main' into design.md.readme-conflict
S-Maxwell Feb 1, 2024
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
7 changes: 2 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
This is a repo that is used, in class, to demonstrate how to solve a merge conflict when it occurs with your teammates. Sometimes Github will automatically solve the issue, other times it cannot and requires human intervention.

Merge conflicts are a common part of working with GitHub. Do not fear the conflicts, my friends! All will be well. W will solve the issues!

Here is some more content that was added through GitHub.
This repo used demonstrates how to solve a merge conflict when it occurs with your teammates. At times Github will automatically solve the issue, other times it cannot and requires human intervention.

Merge conflicts are a very common part of working with GitHub. Do not fear the conflicts, friends!