In which part of the process does Copado first attempt to resolve a merge?

In the process, Copado first attempts to resolve a merge during the Git Merge phase. This stage is critical as it involves integrating changes from different branches or environments before they can be deployed. When multiple developers are working on different features or fixes, their changes may overlap or conflict. During the Git Merge, Copado automatically identifies and attempts to resolve these conflicts based on the content of the branches being merged.

If automatic resolution is not possible, it can flag these conflicts for a manual review later in the process. This ensures that any potential issues are addressed early on, reducing complications in subsequent stages like User Story Compilation or Deployment. Thus, recognizing Git Merge as the point where initial automated conflict resolution occurs is essential for effective version control and collaboration within the development team.