Skip to content

Refactor workshop#40

Merged
razvand merged 1 commit into
mainfrom
lupsalexandra33/refactor_workshop_github
Jun 24, 2026
Merged

Refactor workshop#40
razvand merged 1 commit into
mainfrom
lupsalexandra33/refactor_workshop_github

Conversation

@lupsalexandra33

Copy link
Copy Markdown
Contributor

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
Contributor 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.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Good to me then 👍

Comment thread README.md Outdated
Comment thread README.md Outdated
Comment thread README.md Outdated
Comment thread README.md
@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?

@lupsalexandra33 lupsalexandra33 force-pushed the lupsalexandra33/refactor_workshop_github branch from d6ba1a0 to de204a4 Compare June 21, 2026 19:01
Comment thread README.md Outdated
@razvand

razvand commented Jun 22, 2026

Copy link
Copy Markdown
Member

@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.

@razvanvirtan , it depends. Yes, you could output the same thing, but maybe you want to have control over the order of commits.

Also, we are, as @lupsalexandra33 said, more focused on the learning part of git cherry-pick. So it's all OK.

Comment thread README.md Outdated
@lupsalexandra33 lupsalexandra33 force-pushed the lupsalexandra33/refactor_workshop_github branch from de204a4 to 3067b4f Compare June 23, 2026 14:25
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 3067b4f to 8f71bc7 Compare June 23, 2026 14:32

@razvand razvand 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.

@razvand razvand merged commit 3f0ae94 into main Jun 24, 2026
1 check passed
@razvand razvand deleted the lupsalexandra33/refactor_workshop_github branch June 24, 2026 17:52
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.

7 participants