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

Production decomposition #469

Merged
merged 98 commits into from
Nov 18, 2024
Merged

Production decomposition #469

merged 98 commits into from
Nov 18, 2024

Conversation

isc-pbarton
Copy link
Collaborator

Added a new configurable setting: "Decompose Productions". If enabled, interoperability productions will be represented in the source control repository as a collection of files for individual item settings and production settings. The goal is to allow multiple users in a shared development environment to edit the same production without overwriting or blocking each others' changes.

… refactored into %Studio.SourceControl.Production later.
…age if prod settings are edited by another user
… refactored into %Studio.SourceControl.Production later.
@isc-pbarton isc-pbarton changed the title Setting for production decomposition Production decomposition Oct 18, 2024
@isc-pbarton isc-pbarton marked this pull request as ready for review October 18, 2024 19:29
Copy link
Collaborator

@isc-tleavitt isc-tleavitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few questions, a few changes requested.

@@ -2186,12 +2261,6 @@ ClassMethod GitStatus(ByRef files, IncludeAllFiles = 0)
}
}

ClassMethod EmptyInitialCommit()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this removed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was removed because, instead of doing an empty initial commit, we now export the git-source-control.json file (soon to be renamed) and include that in the initial commit.

@isc-tleavitt isc-tleavitt merged commit 4c5dfee into main Nov 18, 2024
2 checks passed
@isc-tleavitt isc-tleavitt deleted the production-change-control branch November 18, 2024 18:40
@isc-pbarton isc-pbarton linked an issue Nov 19, 2024 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support source control of mapping configuration
3 participants