[Exercise Discussion] T6L2/branch-forward

[damithc]

Existing exercise check

• I have verified that this exercise is not yet already in discussion, in progress, or exists

Lesson

https://nus-cs2103-ay2526s1.github.io/website/book/gitAndGithub/merge/index.html

Exercise learning outcomes

Able to fast-forward merging

Exercise setup

Inputs to the new.sh:

Exercise name: branch-forward
Tags (space separated): git-branch git-merge
Requires Git? (defaults to y)  [y/N]: y
Requires Github? (defaults to y)  [y/N]: N
Exercise repo type (local, remote, or ignore) (defaults to 'local'): local
Exercise repo name (defaults to ...): love-story
Git-Mastery Github repository title (defaults to ''): 
Initialize exercise repo as Git repository? (defaults to y)  [y/N]: Y

Equivalent steps to create the repo

echo -e "Harry was single." >> story.txt
git add .
git commit -m "Introduce Harry"

echo -e "Harry did not have a family." >> story.txt
git commit -am "Add about family"

git switch -c with-ginny
echo -e "Then he met Ginny." >> story.txt
git commit -am "Add about Ginny"

git switch main
echo -e "Harry" >> cast.txt
git add .
git commit -m "Add cast.txt"

git switch -c with-sally
echo -e "Then he met Sally" >> story.txt
git commit -am "Mention Sally"

git switch with-ginny
echo -e "Ginny was single too" >> story.txt
git commit -am "Mention Ginny is single"

Instructions for students

Scenario: You are writing the outline for a story. You now have two parallel storylines in two branches.

Task:

Merge only the branch(es) that can be fast-forwarded. Use fast-forward merging.

Tip: Ensure you have switched to the destination branch before initiating the merge.

Exercise grading

Verify that,

• only with-sally is merged.
• a fast-forward merge is used

Requires remote repository?

No response

Additional remarks

No response

[woojiahao]

@damithc I think in the fifth block of commands, you don't need git add . because you're already using git commit -am. Could you update the instruction? I'll approve regardless

Other than that, LGTM

[woojiahao]

As another note, you don't need the first block of commands. Git-Mastery already handles creating the sub-folder titled love-story based on the initial prompts

[damithc]

@damithc I think in the fifth block of commands, you don't need git add . because you're already using git commit -am. Could you update the instruction? I'll approve regardless

Removed a (git add . is needed because it is an untracked file).

As another note, you don't need the first block of commands. Git-Mastery already handles creating the sub-folder titled love-story based on the initial prompts

Removed.

[VikramGoyal23]

Hi, could I be assigned this issue?

[keerthigkaarthik]

Hi, could I be assigned this issue?

It seems like you have already have a PR for another exercise (#95 ). Would it be alright if I could attempt this instead?

[VikramGoyal23]

@damithc Could you assign one of us this issue?

[damithc]

@VikramGoyal23 Let's give this issue to @keerthigkaarthik, as we are short of issues (and reviewers) and you already have one exercise PR under review.

@keerthigkaarthik go ahead.