Skip to content

Commit

Permalink
fix: wording to be in line with prior instruction
Browse files Browse the repository at this point in the history
The 3rd knowledge check question refers to performing a merge of a
feature branch into main, but in the assignment subsection 'Ongoing Workflow'
instruction 4, we are asked to perform a merge of main into a feature branch
to check for merge conflicts.
  • Loading branch information
MarkR-Dev committed Aug 14, 2024
1 parent 80c02d2 commit cce3e6c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git/intermediate_git/using_git_in_the_real_world.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ The following questions are an opportunity to reflect on key topics in this less

- [What name is typically given for a Git remote that points to a repo that's been forked?](#initial-setup)
- [Can you directly send your changes to a repository that you don't own/have write access to?](#sending-your-pull-request)
- [What should you do immediately before merging your feature branch into main?](#ongoing-workflow)
- [What should you do immediately before merging main into your feature branch?](#ongoing-workflow)

### Additional resources

Expand Down

0 comments on commit cce3e6c

Please sign in to comment.