I have been puzzled about the way iOS handles merge conflicts. Here is my attempt at exploring what happens when merging conflicts with xcode's
-
Notifications
You must be signed in to change notification settings - Fork 0
uncletomiwa/test-ios-merge-conflicts
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Folders and files
| Name | Name | Last commit message | Last commit date | |
|---|---|---|---|---|
Repository files navigation
About
My glorious attempt at using xcode to resolve storyboard merge conflicts
Resources
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published