Refactor workshop#40
Conversation
lupsalexandra33
requested review from
CristianAndrei1423,
andrei-popovici-dev,
george17c,
mateistanuca1 and
razvand
lupsalexandra33
force-pushed
the
lupsalexandra33/refactor_workshop_github
branch
from
359205d to
45b4ce8
Compare
CristianAndrei1423
left a comment
CristianAndrei1423
left a comment
There was a problem hiding this comment.
Good, like the changes from the feedback I gave you.
| 1. Look at the commit for the initial C Hello program: | ||
|
|
||
| ```console | ||
| git show 7fd6e9290dddc2ae799ae5df684668a7d16e87f3 |
There was a problem hiding this comment.
Couldn't it be that the hash will be different for each participant?
There was a problem hiding this comment.
No because it`s already pushed with its hash.
| 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: |
There was a problem hiding this comment.
Isn't rebasing a faster option for this use case, rather than cherry-picking? We may risk teaching some bad practice.
There was a problem hiding this comment.
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.
|
@lupsalexandra33 @mateistanuca1 Also left inline comments but asking here as well. Isn't everything in the |
|
@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
force-pushed
the
lupsalexandra33/refactor_workshop_github
branch
from
d6ba1a0 to
de204a4
Compare
| ./reset-all.sh | ||
| ``` | ||
|
|
||
| ## Create Commits |
There was a problem hiding this comment.
@lupsalexandra33 This section should be removed, as it was already approached in the Git basics workshop: https://github.com/elisaarghir/workshop-git/blob/4dfaad25864a334befe80cb19afcc606e000967a/README.md?plain=1#L584
Maybe it would work with a script that does these steps in preparation for the next section.
There was a problem hiding this comment.
The Create Commit Histroy section is based on the changes you make after completing the tasks from the Create Commits section, that`s why I had to move both of them into this workshop.
5 participants
I did the following changes:
- Modify README
- Add Git Advanced walkthrough (rebase, cherry-pick, reset)
- Add helper scripts and release tagging