Test-drive Tour 3

[damithc]

Similar to #154, but do after #166
Tour available at https://git-mastery.github.io/lessons/trail/workingWithRemotes/

[SAN-MUYUN]

OS: Windows 11
Terminal: Git Bash
Git CLI was used

T3L1

LGTM

T3L2

LGTM

T3L3

hp-fetch-merge

the hands on hp-fetch-merge seems to have a little bit of issue. When running according to the instruction, it does not show number of commits behind the remote repo.

It seems like the local branch is not configured to track any remote branch, so git status has nothing to compare against. The problem can be solved by running git branch --set-upstream-to=origin/master master after git fetch origin

sync-upstream

There seems to be a mistake regarding the naming of this hands on. Instead of sync-upstream, it should be hp-sync-upstream.

[jovnc]

Thanks @SAN-MUYUN for testing!

the hands on hp-fetch-merge seems to have a little bit of issue. When running according to the instruction, it does not show number of commits behind the remote repo.

We can actually run git branch --set-upstream-to=origin/master master during the setup stage, after step 2. We will also need to reflect this change in the hands on setup for git-mastery.

@damithc Do you think we should do this?

There seems to be a mistake regarding the naming of this hands on. Instead of sync-upstream, it should be hp-sync-upstream.

@damithc We need to fix the instructions on the website

[damithc]

Thanks @SAN-MUYUN for testing!

the hands on hp-fetch-merge seems to have a little bit of issue. When running according to the instruction, it does not show number of commits behind the remote repo.

We can actually run git branch --set-upstream-to=origin/master master during the setup stage, after step 2. We will also need to reflect this change in the hands on setup for git-mastery.

@damithc Do you think we should do this?

Thanks for testing and investigation @SAN-MUYUN @jovnc

When I tested this HP just now, it works as expected if I set up the sandbox manually.

But I encounter the stated issue if I use gitmastery hp-fetch-merge to set up the sandbox.

Is that the same for you too?
Strangely, the remote tracking branch seems to set similarly in both cases.

[damithc]

There seems to be a mistake regarding the naming of this hands on. Instead of sync-upstream, it should be hp-sync-upstream.

Fixed.

[jovnc]

When I tested this HP just now, it works as expected if I set up the sandbox manually.

Setting up manually seems to work for me too, I think this is an issue with git-mastery, I'll open an issue to fix this. Seems like there is no need to explicitly run git branch --set-upstream-to=origin/master master when doing manually.

[jovnc]

OS: MacOS
Terminal: zsh
Git CLI was used

T3L1

LGTM

T3L2

LGTM

T3L3

hp-fetch-merge

@damithc There should not be a new tag in the output.

hp-pull-remote

@jovnc Doesn't seem to work as expected, running git pull origin main does not produce the expected output.

Issue: setup in git-mastery does not change the origin is pointing to the wrong repo. #183

[damithc]

T3L3

hp-fetch-merge

@damithc There should not be a new tag in the output.

@jovnc Good catch. Fixed.