In this example project you can demonstrate how to resolve a merge conflict.
Merge the conflicting branches change and addition into this master branch.
-
Notifications
You must be signed in to change notification settings - Fork 15
mercutiodesign/merge-conflict-example
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
About
No description, website, or topics provided.
Resources
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published