Automated Code Conflict Resolution via Interactive Client Interface
Find Innovative SolutionsGenerate Solutions
Solution Overview
Problem
Current software development processes are cumbersome and require extensive collaboration among developers to resolve conflicts when integrating changes into a master code version, leading to slowed development due to the need for numerous communications and meetings.
Innovation Solution
A method and system that allow proposed changes from client devices to be integrated into a master version on a server system, with automatic conflict resolution and a client-side interface for manual resolution via a launched window, enabling developers to interact directly with server-side integration/conflict resolution software to resolve conflicts without extensive collaboration.
Engineering Contradictions & Design Principles
Engineering Contradiction Analysis
1Reliability
If developers collaborate extensively to resolve conflicts manually, then conflict resolution accuracy is improved, but development time increases significantly
Solution Approach 1:
The system performs preliminary automated conflict resolution before requiring manual intervention. The server automatically attempts to resolve conflicts using integration rules and algorithms, and only presents unresolved conflicts to developers for manual resolution. This preliminary automated action reduces the overall time required while maintaining accurate resolution of complex conflicts that do require human judgment.
2Productivity
If automated integration software is used, then integration speed is improved, but conflict resolution capability deteriorates
Solution Approach 1:
The conflict resolution process is segmented into two distinct phases: automated resolution for straightforward conflicts and manual resolution for complex conflicts requiring human judgment. The server handles automated integration and resolution of simple conflicts at high speed, while developers are engaged only for resolving remaining complex conflicts, thus achieving both high productivity and reliable conflict resolution capability.
Solution Approach 2:
The server acts as an intermediary between automated integration processes and manual developer intervention. It automatically processes and resolves conflicts that can be handled algorithmically, then presents only the unresolved conflicts to developers through a user interface. This intermediary role allows the system to leverage both automated speed and human judgment appropriately.
3Stability of the object's composition
If developers work with the same master version simultaneously, then code consistency is improved, but communication overhead increases
Solution Approach 1:
The system implements continuous feedback loops where the server automatically integrates proposed changes from multiple developers and detects conflicts. This feedback mechanism maintains code consistency by ensuring all developers work from the current master version while automatically managing the integration process, eliminating the need for constant manual communication to maintain synchronization.
Solution Approach 2:
The integration and conflict resolution process is self-service in that the server automatically manages code integration, conflict detection, and resolution without requiring manual coordination between developers. The system serves itself by automatically pulling changes from developers, attempting automated resolution, and updating the master version, thereby maintaining code consistency while minimizing communication overhead.
Data Source
AI summary
Proposed changes to a source code generated by client computing devices are integrated with a master version of the code resident on a server computing system remote from the client devices. The client devices connect to the server system over a network and transmit proposed changes to the server system, where resident integration/conflict resolution software automatically integrates the proposed changes into the master version. Any unresolved conflicts remaining after the automatic integration are identified and the server system automatically sends an email notifying the one or more client devices that there are unresolved conflicts. The email includes a link that enables a client device to launch a window on a monitor, and the client device user employs the window to transmit commands directly to and receive further communications directly from the integration/conflict resolution software in an interactive operation to attempt to manually resolve the conflicts.