Hello to All, My team is facing a source control workflow challenge with Git when it comes to having a shared resource.
Here is the team make-up: - Sprint Team #1 - Sprint Team #2 - *Shared* DBA across teams - Dev. Lead (Myself) Now, each sprint we have available the following branches: 1. Master (Representative of Production) 2. Hotfix (Copy of master for push/pull of hotfixes) 3. Release (What will be deployed next release; reconciliation of all further branches below) 4. sprint/release team #1 branch (Represents all consolidated code for team #1; changes per sprint and reconciled to release branch at end of sprint) 5. sprint/release team #2 branch (Represents all consolidated code for team #2; changes per sprint and reconciled to release branch at end of sprint) 6. shared resource branch (For shared DBA) 7. Other personal branches for developers (not to be considered authoritative for reconciliation) *See attached for diagrammed version of the branching structure above.* The problem is that the shared DBA needs to constantly and consistently make changes *across* teams for SQL-related items. In addition, for just SQL related items his changes need to be considered authoritative. His changes are localized to a specific folder, if that helps. *Is there either a workflow or git configuration that will allow for the shared resource to effectively work either on his own branch while allowing for the team to effectively collaborate with his changes?* Thank you for your time. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
