[Exercise Discussion] T6/mix-messy-graph

[damithc]

Existing exercise check

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

Lesson

This exercise will appear at the bottom of the tour https://nus-cs2103-ay2526s1.github.io/website/book/gitAndGithub/trail/branchingLocally/index.html

Exercise learning outcomes

It covers all topics of the above tour, including detours

Exercise setup

Inputs to the new.sh:

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

Clone gm-user-docs as user-docs.

git remote remove origin # delete remote ref to make this a local repo
git checkout main
git merge feature-search --no-ff -m "Merge search feature"

The result should be as follows:

gitGraph BT:
  commit id: "Add features.md"
  commit id: "Mention feature for creating books" tag: "v10"
  branch feature-search
  branch feature-delete
  branch list
  checkout feature-delete
  commit id: "Mention feature for deleting books"
  checkout feature-search
  commit id: "Mention feature for searching books"
  checkout feature-delete
  commit id: "Add missing period"
  checkout main
  commit id: "Fix phrasing of heading"
  checkout feature-search
  commit id: "Add more details on the search feature"
  checkout list
  commit id: "Add partial docs for listing books"
  checkout main
  merge feature-search id: "Merge search feature"

Loading

Instructions for students

See https://git-mastery.github.io/lessons/branchDelete/exercise-mix-messy-graph.html

Exercise grading

Verify the revision graph is as expected.
Verify the features.md file has the expected contents. OK to have minor variations in blank lines.

Requires remote repository?

Yes. https://github.com/git-mastery/gm-user-docs

Additional remarks

No response

[woojiahao]

@damithc Similar comment to #70 where we should specify the expected output so that the students can self verify too!

[damithc]

@damithc Similar comment to #70 where we should specify the expected output so that the students can self verify too!

Updated.

[woojiahao]

@damithc maybe I'm just blind but where did you add the expected output? :o 😅

[damithc]

@damithc maybe I'm just blind but where did you add the expected output? :o 😅

[woojiahao]

Confirmed no conflicts caused so we can just allow students to merge as-is