This is a repo for demoing how to solve a merge conflict when it occurs with your partner or teammates...
Merge conflicts are common and part of working with GitHub. Do not fear the conflicts.
forked from m-deluca/conflict-example-f23
-
Notifications
You must be signed in to change notification settings - Fork 0
This repo is for demonstrating how to set solve a merge conflict.
License
Emmanuel9494/conflict-example-f23
Folders and files
| Name | Name | Last commit message | Last commit date | |
|---|---|---|---|---|
Repository files navigation
About
This repo is for demonstrating how to set solve a merge conflict.
Resources
License
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published