Issues with current git_immersion tutorial. #29
Description
First thanks for the tutorial. I've encountered some issues in the later Labs. Also the current version is using switch and restore in place of other commands, which shows up early. Those I was able to work around as there is backward compatibility with earlier commands it seems. In any event here are my notes from the later labs.
Git Immersion Notes
Issues encountered with this tutorial.
Local installed git version is 2.25.4.
LAB 40
Remote Branches
Tutorial says:
• $ git branch
• * master
Local result:
• $git branch
• * greet
$git branch -a
- greet
remotes/origin/HEAD -> origin/greet
remotes/origin/greet
remotes/origin/master
Lab 42
Fetching Changes
Tutorial says:
$ git fetch
From /Users/jim/Downloads/git_tutorial/work/hello
e0cc19e..b39ac69 master -> origin/master
Local result:
$git fetch
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), 375 bytes | 375.00 KiB/s, done.
From /home/gump/myCloud/mygit/hello
fadb8ee..888d9a4 greet -> origin/greet
Lab 43
Merging Pulled Changes
Tutorial says:
$ git merge origin/master
Updating e0cc19e..b39ac69
Fast-forward
README | 1 +
1 file changed, 1 insertion(+)
Local result:
$git merge origin/master
Already up to date.
As there was a conflict between the Tutorial and reality, I attempted the following based on what I saw in the git -hist output from the cloned_hello repository:
- 888d9a4 2020-07-01 | Changed README in original repo (origin/greet, origin/HEAD) [Gayland G. Gump]
- fadb8ee 2020-07-01 | Hello user Greeter (HEAD -> greet, origin/master) [Gayland G. Gump]
I executed the following:
git merge origin/greet
with the following results:
Updating fadb8ee..888d9a4
Fast-forward
README | 1 +
1 file changed, 1 insertion(+)
and then the check of README, cat README, yielded:
This is the Hello World example from the git tutorial.
(changed in original)
Lab 45
Adding a Tracking Branch
Not going to bother telling you what the Tutorial says will just report what I am seeing on my local system and any alternatives I can guess at.
git branch --track greet origin/greet
fatal: A branch named 'greet' already exists.
git branch --track greet origin/master
fatal: A branch named 'greet' already exists.
Don't have a clue where to go from here. Have decided to leave the tutorial at this point as I am not sure if the time will be well spent in view of my current needs.
Thanks, the tutorial is great. Hope my feedback will help you pull it up to a current state.