The new Philly Truce iOS app, initially developed in December 2022.
-
Updated
Feb 17, 2023 - Swift
The new Philly Truce iOS app, initially developed in December 2022.
An Xcode Source Editor Extension that helps resolving merge conflicts. There are three options, namely 'Accept theirs', 'Accept Yours', and 'Keep Both'. Only one click and it will make the change for you automatically.
Add a description, image, and links to the conflict-resolution topic page so that developers can more easily learn about it.
To associate your repository with the conflict-resolution topic, visit your repo's landing page and select "manage topics."