Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: detect potential solution merge conflicts #57

Merged
merged 10 commits into from
Feb 3, 2021

Conversation

ewingjm
Copy link
Owner

@ewingjm ewingjm commented Feb 2, 2021

Purpose

We have issues with changes being made to the same components simultaneously with large teams. The goal is to prevent this from happening altogether (#9) but platform limitations mean that we do not yet have a solution for this. However, we may be able to prevent some of these conflicts from being merged if we can notify at the approval stage.

Approach

When approving a solution merge, a confirmation dialog will appear if any of the solution components in the development solution have been found in any other development solutions. The confirmation dialog will also include the offending solution names.

TODOs

  • Automated test coverage for new code
  • Documentation updated (if required)
  • Build and tests successful

@ewingjm ewingjm added the enhancement New feature or request label Feb 2, 2021
@ewingjm ewingjm merged commit 1ec40d1 into master Feb 3, 2021
@ewingjm ewingjm deleted the docs/update-docs-for-new-deployment-parameters branch February 3, 2021 06:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant