Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Fixing UnityYamlMerge to use merge driver #978

Merged
merged 1 commit into from
Dec 6, 2018
Merged

Fixing UnityYamlMerge to use merge driver #978

merged 1 commit into from
Dec 6, 2018

Conversation

StanleyGoldman
Copy link
Contributor

Related to #974
Fixes #943

  1. On project initialization, configure UnityYamlMerge to be executed as a merge driver
  2. On first load of a projeect, if a repository exists.
    1. Remove any UnityYamlMerge merge tool configuration
    2. If the incorrectly spelled legacy unityamlmerge is found in the .gitattributes file
      1. Add an additional misspelled configuration for merge driver configuration
      2. Remove any misspelled merge tool configurations

@StanleyGoldman StanleyGoldman requested a review from shana December 3, 2018 17:19
@StanleyGoldman
Copy link
Contributor Author

Thanks @bk2204 for teaching us how merge drivers are supposed to work

@shana shana merged commit 3333b53 into master Dec 6, 2018
@shana shana deleted the unity-yaml-merge-config branch December 6, 2018 22:39
This was referenced Dec 10, 2018
Closed
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@shana shana shana approved these changes

Assignees
No one assigned
Labels
ready-for-review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@StanleyGoldman @shana