Skip to content

Evaluation: Large Merge Conflict #547

@Prajna1999

Description

@Prajna1999

In the Evaluation: Use Config Management and Evaluation: Refactor there are large merge conflicts due to the following files. Between these two PRs

  1. 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.
  2. Nested app/api/routes/evaluations/evaluation.py has been added in the Evaluation: Refactor that does not exist in the former.

For reference.

Image

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.

Metadata

Metadata

Assignees

Labels

enhancementNew feature or request

Type

No type

Projects

Status

To Do

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions