Merge Conflict Resolution

uprm-inso4101-2024-2025-s1 / semester-project-mercado-colegial-online

semester-project-mercado-colegial-online created by GitHub Classroom

8 stars 2 forks source link

Closed ActuallySeb closed 1 month ago

ActuallySeb commented 2 months ago

Objective: Resolve conflicts when merging any branches as they arise.

Completion Criteria: Ensure that all merges go as smoothly as possible

Completion Date: End of 1st Milestone

Urgency: 7 Difficulty: 6

david-baez-bravo commented 1 month ago

This task format will no longer be used. Merge conflict tasks will be created and solved as they arise.