Skip to content

Conversation

@mohsenzamanist
Copy link

Learners, PR Template

Self checklist

  • I have titled my PR with Region | Cohort | FirstName LastName | Sprint | Assignment Title
  • My changes meet the requirements of the task
  • I have tested my changes
  • My changes follow the style guide

Changelist

Completed the tasks in sprint-3/2-practice-tdd

Questions

@mohsenzamanist mohsenzamanist added the Needs Review Trainee to add when requesting review. PRs without this label will not be reviewed. label Jan 28, 2026
@cjyuan
Copy link
Contributor

cjyuan commented Jan 29, 2026

CYF's "Module-Structuring-and-Testing-Data" repo has bee updated recently.
Please use the "Sync Fork" feature to update all the branches (including main) in your forked repo.

Most of your branches should be able to be updated just fine.

However, the two branches related to "Sprint-3/2-practice-tdd" and "Sprint-3/1-implement-and-rewrite-tests"
will encounter merge conflict. So for these two branches, my suggestion is,

  1. Close these two PRs and don't update their corresponding branches.
  2. After updating the main branch, create new Sprint-3 branches, and then reuse your code in the new branches.
  3. Submit PRs from the new branches.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Needs Review Trainee to add when requesting review. PRs without this label will not be reviewed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants