In this example project you can demonstrate how to resolve a merge conflict.
Merge the conflicting branches change and addition into this master branch.
mercutiodesign/merge-conflict-example
Folders and files
| Name | Name | Last commit date | ||
|---|---|---|---|---|
| Name | Name | Last commit date | ||
|---|---|---|---|---|