Skip to content

Commit 0fcb07f

Browse files
author
ayusuf22
committed
fix merge conflict
1 parent 7d4c2b5 commit 0fcb07f

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

  • tech_lab_on_campus/market_watch/producer_and_consumer

tech_lab_on_campus/market_watch/producer_and_consumer/README.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@ In this section, you will collaborate with a partner to instantiate the producer
99
**Setup (Do this together):**
1010
1. **Decide who will be the fork owner** - This person will create the fork of the lab repository
1111
2. **Fork owner**: Fork the repository to your GitHub account
12+
- Look for a "Fork" button in the top right corner of the main repo screen
13+
- After forking, it should take you to your fork of the repo. The repo name will be `<your_github_username>/bbit-learning-labs`
1214
3. **Fork owner**: Add your partner as a collaborator:
1315
- Go to your fork's Settings → Collaborators → Add people
1416
- Enter your partner's GitHub username and send the invitation
1517
4. **Partner**: Accept the collaboration invitation (check your email or GitHub notifications)
16-
5. **Both students**: Clone the same fork to your local machine using `git clone`
18+
5. **Both students**:
19+
- Codespaces: Create a codespace from the same forked repo
20+
- Local: Clone the same fork to your local machine using `git clone`
1721
6. **Both students**: Ensure you can bring up the lab successfully
1822

1923
**Division of Work:**
@@ -31,15 +35,15 @@ In this section, you will collaborate with a partner to instantiate the producer
3135
4. **Partner A**: Pull Partner B's consumer code: `git pull`
3236
5. **Both students**: Verify you both have the complete solution (producer + consumer)
3337

34-
**Testing Together:**
35-
- Once both partners have pulled all changes, follow the `testing instructions below` to send and receive messages
36-
- Both partners should be able to run the complete solution on their machines
37-
3838
**Important Notes:**
3939
- Communicate frequently with your partner about your progress
4040
- If you encounter merge conflicts, work together to resolve them
4141
- Use the [git_commands.md](../resources/git_commands.md) file for Git command reference
4242

43+
**Testing Together:**
44+
- Once both partners have pulled all changes, follow the `testing instructions below` to send and receive messages
45+
- Both partners should be able to run the complete solution on their machines
46+
4347

4448
`IMPORTANT!!!` Please utilize the [Functions.md](../Resources/Functions.md) file as it contains almost all the functions you will need for this lab. Also, other helpful information can be found under the Resources folder for Python, Git, and RabbitMQ details.
4549

0 commit comments

Comments
 (0)