Remove fork details from git week 1 assignment and session plan - #331
Conversation
| 2. Check out to a new branch called `html-and-css` | ||
| 3. Add the session exercises from the previous week to the `html-css/week1` folder | ||
| 3. Add the session exercises from the previous week to a folder called `week1` inside another folder called `html-css` | ||
| 4. Create a PR (Pull Request) [to your own repository](https://github.com/HackYourFuture-CPH/hyf-assignment-template?tab=readme-ov-file#2-submission-process), from your `html-and-css` branch to merge changes into the `main` branch |
There was a problem hiding this comment.
This link also leads to an explanation with forking (above the PR process description). Will you please update it too?
There was a problem hiding this comment.
I can remove it for now until we make a new instruction to replace it. Is that ok @diwanow and @jason-vasilev?
There was a problem hiding this comment.
I thought about it, but it demonstrates how to make a PR without pointing to a forked repo. It's a bit confusing, but still shows good flow of how to make a PR.
@saloumeh-67 do we have other place where we show them how to make PRs and add them to the Assignment Google Sheet?
There was a problem hiding this comment.
With this setup, since everything lives in the trainee's own repository, there's no ongoing "sync" ? right? Then how do trainees receive new assignment files or updates from HYF's side later on?
There was a problem hiding this comment.
I thought about it, but it demonstrates how to make a PR without pointing to a forked repo. It's a bit confusing, but still shows good flow of how to make a PR. @saloumeh-67 do we have other place where we show them how to make PRs and add them to the Assignment Google Sheet?
No But I can make a new one.
Co-authored-by: Dimitar Dimitrov <d_iwanow@outlook.com>
Co-authored-by: Dimitar Dimitrov <d_iwanow@outlook.com>
Co-authored-by: Dimitar Dimitrov <d_iwanow@outlook.com>
| 2. Check out to a new branch called `html-and-css` | ||
| 3. Add the session exercises from the previous week to the `html-css/week1` folder | ||
| 3. Add the session exercises from the previous week to a folder called `week1` inside another folder called `html-css` | ||
| 4. Create a PR (Pull Request) [to your own repository](https://github.com/HackYourFuture-CPH/hyf-assignment-template?tab=readme-ov-file#2-submission-process), from your `html-and-css` branch to merge changes into the `main` branch |
There was a problem hiding this comment.
I can remove it for now until we make a new instruction to replace it. Is that ok @diwanow and @jason-vasilev?
|
|
||
| ### Exercise 2 | ||
|
|
||
| 1. When you are on `main` branch, of the assignment repository create a branch named `git-week1/exercise-1/<your-name>` and move to it |
There was a problem hiding this comment.
We can remove it from this part, but then I need to remove this from all the exercises explanation, since it's been mention everywhere.
| 2. Check out to a new branch called `html-and-css` | ||
| 3. Add the session exercises from the previous week to the `html-css/week1` folder | ||
| 3. Add the session exercises from the previous week to a folder called `week1` inside another folder called `html-css` | ||
| 4. Create a PR (Pull Request) [to your own repository](https://github.com/HackYourFuture-CPH/hyf-assignment-template?tab=readme-ov-file#2-submission-process), from your `html-and-css` branch to merge changes into the `main` branch |
There was a problem hiding this comment.
With this setup, since everything lives in the trainee's own repository, there's no ongoing "sync" ? right? Then how do trainees receive new assignment files or updates from HYF's side later on?
| 2. Check out to a new branch called `html-and-css` | ||
| 3. Add the session exercises from the previous week to the `html-css/week1` folder | ||
| 3. Add the session exercises from the previous week to a folder called `week1` inside another folder called `html-css` | ||
| 4. Create a PR (Pull Request) [to your own repository](https://github.com/HackYourFuture-CPH/hyf-assignment-template?tab=readme-ov-file#2-submission-process), from your `html-and-css` branch to merge changes into the `main` branch |
There was a problem hiding this comment.
I thought about it, but it demonstrates how to make a PR without pointing to a forked repo. It's a bit confusing, but still shows good flow of how to make a PR. @saloumeh-67 do we have other place where we show them how to make PRs and add them to the Assignment Google Sheet?
No But I can make a new one.
3 participants
Overview
We are simplifying the trainee Git workflow by moving away from the fork-based assignment setup.
Previously, trainees would fork the assignment template repository and open PRs from their fork back to the template repository. While this worked technically, it created unnecessary confusion around repository ownership, PR targets, and the fact that mentor-approved PRs would not be merged into the template repository.
New approach
Trainees should instead:
This keeps the entire workflow within the trainee's own repository and removes the distinction between the repository they work in and the repository they are expected to submit against.
Why we're changing this
The new setup is simpler and more intuitive, particularly for beginners. It avoids confusion around:
It also makes the process easier for mentors to review and manage, since each trainee's work and PR history lives in a single repository.
In short, trainees work in their own repository, and PRs target their own main branch. This gives us a much simpler and more predictable workflow for both trainees and mentors.