💡 Feature: Use game-ci to get early warning about merge conflicts to make it easier to integrate #34
frostebite
started this conversation in
Ideas
Replies: 0 comments
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
-
Concept:
Run a game-ci command to scan changed files in appropriate branches targeting a common integration branch e.g main
The system would then produce a notification, warning or indicator to show as early as possible a conflict between two branches incoming.
This early warning should enable developers to integrate changes significantly more easily because they will have a lot of additional warning while a branch is still under active changes.
Developers may resolve conflicts in discussion with co-developers, realize logical overlap in their work or consider better options for decomposing their project files.
There are options that make sense for merging serialized component data in unity Yaml files that could also be exposed. These are not typically offered in merge resolution tools by default. (Managing merging on a per parameter basis and avoiding breaking object references in the project)
Beta Was this translation helpful? Give feedback.
All reactions