[Exercise Discussion] fetch-and-pull

[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/pull/index.html

Exercise learning outcomes

Able to pull from remotes, to the default branch.

Exercise setup

exercise name: fetch-and-pull
tags: git-pull git-fetch

Clone git-mastery/gm-shapes repo to fetch-and-pull/gm-shapes

Instructions for students

You have been given a clone of the git-mastery/gm-shapes repo.

Another developer Alice's has created a remote copy of this repo at https://github.com/git-mastery/gm-shapes-alice which seems to have an additional commit in the main branch. Add that repo as a remote, and bring over Alice's additional commit to your repo.

Alice's friend Bob has copied Alice's repo to https://github.com/git-mastery/gm-shapes-bob, and added one more commit. Add that repo as another remote, and fetch (not pull or merge) his new commit to your repo.

Exercise grading

Verify that,

1. both repos have been added as remotes
2. Alice's main branch has been pulled
3. Bob's main branch has been fetched but not merged

Requires remote repository?

https://github.com/git-mastery/gm-shapes-alice https://github.com/git-mastery/gm-shapes-bob

Additional remarks

No response

[damithc]

@woojiahao can do this too, before log-and-order?

[woojiahao]

I've already started working on log-and-order: #33

I'm following the order we agreed on:

[damithc]

I'm following the order we agreed on:

Order still holds, but we'll need to skip less important ones because we are past the deadline now :-) Students will be starting on exercises any minute now.

[woojiahao]

Okay understood. I think that in the future, let's agree on the order by priority as well since the previous ordering was agreed on because the Git log exercise came under tour 1 which was before tour 3, so I started working on fleshing out the details and exercise because it was tour 1 and left the tour 3 ones to be done after.

[woojiahao]

Assigned to @woojiahao

[woojiahao]

Because the instructions are given to students in order, the checks will also be performed in order:

1. Alice's repo is added as a remote
2. Alice's branch has been pulled
3. Bob's repo is added as a remote
4. Bob's main branch has been fetched but not merged

Also going to provide a name for the remotes by doing alice-upstream and bob-upstream

[woojiahao]

@damithc sorry, need to update the app version, I realized I pushed a new version of git-autograder so the app needs to be rebuilt, give me a second

[woojiahao]

Publishing version v4.1.0