Updates to the base blueprint often result in annoying and not really needed merge conflicts. Typically the merge conflicts can just be resolved to the new stuff anyways.
Description
This PR updates the default merge resolution strategy to prefer proposed for the blueprint builder. Depending on how this goes, it might make sense to make this the default for all blueprints.
Testing
How was this change tested?
Additional context
Add any other context about the PR here.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Issue
Updates to the base blueprint often result in annoying and not really needed merge conflicts. Typically the merge conflicts can just be resolved to the new stuff anyways.
Description
This PR updates the default merge resolution strategy to prefer proposed for the blueprint builder. Depending on how this goes, it might make sense to make this the default for all blueprints.
Testing
How was this change tested?
Additional context
Add any other context about the PR here.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.