merge-conflicts

Here are 2 public repositories matching this topic...

liaojinxing / ConflictResolver

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.

merge-conflicts conflict-resolution xcode xcode-source-editor-extension

Updated Mar 10, 2018
Swift

pg8wood / changelog-generator

Star

Curbing Cumbersome Changelog Conflicts.

git merge-conflicts markdown changelog versioning semantic-versioning release keepachangelog changelogger changelog-generator

Updated Apr 7, 2023
Swift

Improve this page

Add a description, image, and links to the merge-conflicts topic page so that developers can more easily learn about it.

Curate this topic

Add this topic to your repo

To associate your repository with the merge-conflicts topic, visit your repo's landing page and select "manage topics."

Learn more

Provide feedback

Saved searches

Use saved searches to filter your results more quickly