In the Evaluation: Use Config Management and Evaluation: Refactor there are large merge conflicts due to the following files. Between these two PRs
- Top level
app/api/routes/evaluation.py has been deleted in the Evaluation: Refactor PR containing changes related to config management in Evaluation: Use Config ManagementPR.
- Nested
app/api/routes/evaluations/evaluation.py has been added in the Evaluation: Refactor that does not exist in the former.
For reference.
I had earlier hadn't paid enough attention to these files while resolving conflicts creating downstream issue wrt config management, routing and unified API config management. It's very difficult to resolve the issues in the merge editor. The simplest way to resolve the conflict would be to close this PR, create another ad hoc PR from manually copying latest evaluation refactor changes and committing to main.
In the
Evaluation: Use Config ManagementandEvaluation: Refactorthere are large merge conflicts due to the following files. Between these two PRsapp/api/routes/evaluation.pyhas been deleted in theEvaluation: RefactorPR containing changes related to config management inEvaluation: Use Config ManagementPR.app/api/routes/evaluations/evaluation.pyhas been added in theEvaluation: Refactorthat does not exist in the former.For reference.
I had earlier hadn't paid enough attention to these files while resolving conflicts creating downstream issue wrt config management, routing and unified API config management. It's very difficult to resolve the issues in the merge editor. The simplest way to resolve the conflict would be to close this PR, create another ad hoc PR from manually copying latest evaluation refactor changes and committing to main.