Skip to content

Refactor workshop#40

Open
lupsalexandra33 wants to merge 1 commit into
mainfrom
lupsalexandra33/refactor_workshop_github
Open

Refactor workshop#40
lupsalexandra33 wants to merge 1 commit into
mainfrom
lupsalexandra33/refactor_workshop_github

Conversation

@lupsalexandra33

Copy link
Copy Markdown

I did the following changes:
- Modify README
- Add Git Advanced walkthrough (rebase, cherry-pick, reset)
- Add helper scripts and release tagging

@CristianAndrei1423 CristianAndrei1423 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good, like the changes from the feedback I gave you.

Comment thread README.md
1. Look at the commit for the initial C Hello program:

```console
git show 7fd6e9290dddc2ae799ae5df684668a7d16e87f3

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't it be that the hash will be different for each participant?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No because it`s already pushed with its hash.

Comment thread README.md
1. Look at the commit for the initial C Hello program:

```console
git show 04cf0f57f2853d73a5c25082d4652fef63da8f57

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

Comment thread README.md Outdated
Comment thread README.md Outdated
Comment thread README.md Outdated
Comment thread README.md
Scroll the commit history and copy the commit ID belonging to the `c-bye` program.
That is, the ID of the commit you created earlier with the message: `Introduce C Bye on Unikraft`.

1. Use the commit ID cherry pick the commit from the `base` branch to the `scripts` branch:

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't rebasing a faster option for this use case, rather than cherry-picking? We may risk teaching some bad practice.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its just for learning because the students need to see that you can pick a commit from any branch. A commit doesnt belong to any branch it belongs to the repository.

@razvanvirtan

Copy link
Copy Markdown

@lupsalexandra33 @mateistanuca1 Also left inline comments but asking here as well. Isn't everything in the Create commit history and Edit commit history simply solved by rebasing the branches one on top of the other from the very beginning? I feel like we are teaching the wrong solution to a common problem.

@mateistanuca1

Copy link
Copy Markdown

@razvand what do you think?

I did the following changes:
    - Modify README
    - Add Git Advanced walkthrough (rebase, cherry-pick, reset)
    - Add helper scripts and release tagging
    - Common script for resetting the repository

Signed-off-by: Lupsa Alexandra <alexandra.lupsa1103@stud.acs.upb.ro>
@lupsalexandra33 lupsalexandra33 force-pushed the lupsalexandra33/refactor_workshop_github branch from d6ba1a0 to de204a4 Compare June 21, 2026 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants