{"id":29021566,"url":"https://github.com/elyse502/gym-git-exercise-solutions","last_synced_at":"2026-05-18T02:02:43.733Z","repository":{"id":299456292,"uuid":"1003027199","full_name":"elyse502/Gym-Git-Exercise-Solutions","owner":"elyse502","description":"Git Basics","archived":false,"fork":false,"pushed_at":"2025-09-03T10:06:47.000Z","size":27,"stargazers_count":1,"open_issues_count":0,"forks_count":0,"subscribers_count":0,"default_branch":"main","last_synced_at":"2025-10-07T23:36:09.944Z","etag":null,"topics":["git","github","github-config"],"latest_commit_sha":null,"homepage":"https://www.notion.so/Git-Basics-21453d722d1d807894cfc4c5302467ce","language":"HTML","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":null,"status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/elyse502.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":null,"code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null,"governance":null,"roadmap":null,"authors":null,"dei":null,"publiccode":null,"codemeta":null,"zenodo":null,"notice":null,"maintainers":null,"copyright":null,"agents":null,"dco":null,"cla":null}},"created_at":"2025-06-16T14:04:54.000Z","updated_at":"2025-09-03T12:41:55.000Z","dependencies_parsed_at":null,"dependency_job_id":"c2050d08-98fd-48fe-a05a-19b784b0e464","html_url":"https://github.com/elyse502/Gym-Git-Exercise-Solutions","commit_stats":null,"previous_names":["elyse502/gym-git-exercise-solutions"],"tags_count":0,"template":false,"template_full_name":null,"purl":"pkg:github/elyse502/Gym-Git-Exercise-Solutions","repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/elyse502%2FGym-Git-Exercise-Solutions","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/elyse502%2FGym-Git-Exercise-Solutions/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/elyse502%2FGym-Git-Exercise-Solutions/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/elyse502%2FGym-Git-Exercise-Solutions/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/elyse502","download_url":"https://codeload.github.com/elyse502/Gym-Git-Exercise-Solutions/tar.gz/refs/heads/main","sbom_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/elyse502%2FGym-Git-Exercise-Solutions/sbom","scorecard":null,"host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":286080680,"owners_count":33162446,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2026-05-17T22:39:12.733Z","status":"online","status_checked_at":"2026-05-18T02:00:06.436Z","response_time":71,"last_error":null,"robots_txt_status":"success","robots_txt_updated_at":"2025-07-24T06:49:26.215Z","robots_txt_url":"https://github.com/robots.txt","online":true,"can_crawl_api":true,"host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":["git","github","github-config"],"created_at":"2025-06-26T02:06:39.495Z","updated_at":"2026-05-18T02:02:43.726Z","avatar_url":"https://github.com/elyse502.png","language":"HTML","funding_links":[],"categories":[],"sub_categories":[],"readme":"# GIT Exercise\n## Bundle 1\n### Exercise 1\n```bash\nelysee@DESKTOP-73EL1TL:~/the-gym-uok$ mkdir Gym-Git-Exercise-Solutions\nelysee@DESKTOP-73EL1TL:~/the-gym-uok$ cd Gym-Git-Exercise-Solutions/\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git init\nhint: Using 'master' as the name for the initial branch. This default branch name\nhint: is subject to change. To configure the initial branch name to use in all\nhint: of your new repositories, which will suppress this warning, call:\nhint:\nhint:   git config --global init.defaultBranch \u003cname\u003e\nhint:\nhint: Names commonly chosen instead of 'master' are 'main', 'trunk' and\nhint: 'development'. The just-created branch can be renamed via this command:\nhint:\nhint:   git branch -m \u003cname\u003e\nInitialized empty Git repository in /home/elysee/the-gym-uok/Gym-Git-Exercise-Solutions/.git/\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ touch README.md\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git status\nOn branch master\n\nNo commits yet\n\nUntracked files:\n  (use \"git add \u003cfile\u003e...\" to include in what will be committed)\n        README.md\n\nnothing added to commit but untracked files present (use \"git add\" to track)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git branch -M main\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git branch\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git remote add origin https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git remote -v\norigin  https://github.com/elyse502/Gym-Git-Exercise-Solutions.git (fetch)\norigin  https://github.com/elyse502/Gym-Git-Exercise-Solutions.git (push)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git add . \u0026\u0026 git commit -m \"Initial project commit\"\n[main (root-commit) 9f5cded] Initial project commit\n 1 file changed, 0 insertions(+), 0 deletions(-)\n create mode 100644 README.md\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git push -u origin main\nEnumerating objects: 3, done.\nCounting objects: 100% (3/3), done.\nWriting objects: 100% (3/3), 222 bytes | 37.00 KiB/s, done.\nTotal 3 (delta 0), reused 0 (delta 0), pack-reused 0\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n * [new branch]      main -\u003e main\nbranch 'main' set up to track 'origin/main'.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout -b dev\nSwitched to a new branch 'dev'\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout -b test\nSwitched to a new branch 'test'\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout dev\nM       README.md\nSwitched to branch 'dev'\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git branch\n* dev\n  main\n  test\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git branch -d test\nDeleted branch test (was 9f5cded).\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git branch\n* dev\n  main\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$\n```\n\n### Exercise 2\n```bash\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ echo \"\u003ch1\u003eHello, World\u003c/h1\u003e\" \u003e home.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git add .\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git stash\nSaved working directory and index state WIP on main: ba6b00a Add Solution to Exercise 1\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ echo \"\u003cp\u003eI am a trainee at the Gym\u003c/p\u003e\" \u003e about.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git add .\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git stash\nSaved working directory and index state WIP on main: ba6b00a Add Solution to Exercise 1\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ echo \"\u003ch2\u003eOur Team\u003c/h2\u003e\" \u003e team.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git status\nOn branch main\nYour branch is up to date with 'origin/main'.\n\nUntracked files:\n  (use \"git add \u003cfile\u003e...\" to include in what will be committed)\n        team.html\n\nnothing added to commit but untracked files present (use \"git add\" to track)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git add . \u0026\u0026 git stash\nSaved working directory and index state WIP on main: ba6b00a Add Solution to Exercise 1\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ ls\nREADME.md\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git stash list\nstash@{0}: WIP on main: ba6b00a Add Solution to Exercise 1\nstash@{1}: WIP on main: ba6b00a Add Solution to Exercise 1\nstash@{2}: WIP on main: ba6b00a Add Solution to Exercise 1\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git stash pop 1\nOn branch main\nYour branch is up to date with 'origin/main'.\n\nChanges to be committed:\n  (use \"git restore --staged \u003cfile\u003e...\" to unstage)\n        new file:   about.html\n\nDropped refs/stash@{1} (856d2482b2bb9a4c9dfd2269ad0dfb9c802aa532)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ ls\nREADME.md  about.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git stash list\nstash@{0}: WIP on main: ba6b00a Add Solution to Exercise 1\nstash@{1}: WIP on main: ba6b00a Add Solution to Exercise 1\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git stash pop 1\nOn branch main\nYour branch is up to date with 'origin/main'.\n\nChanges to be committed:\n  (use \"git restore --staged \u003cfile\u003e...\" to unstage)\n        new file:   about.html\n        new file:   home.html\n\nDropped refs/stash@{1} (eecd2301dfb1a368665c91fd6a115d277c2ee1d3)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git commit -m \"Add home and about pages\" \u0026\u0026 git push\n[main 4904368] Add home and about pages\n 2 files changed, 2 insertions(+)\n create mode 100644 about.html\n create mode 100644 home.html\nEnumerating objects: 5, done.\nCounting objects: 100% (5/5), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (2/2), done.\nWriting objects: 100% (4/4), 381 bytes | 42.00 KiB/s, done.\nTotal 4 (delta 0), reused 0 (delta 0), pack-reused 0\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n   ba6b00a..4904368  main -\u003e main\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git stash list\nstash@{0}: WIP on main: 4904368 Add home and about pages\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git stash pop\nOn branch main\nYour branch is up to date with 'origin/main'.\n\nChanges to be committed:\n  (use \"git restore --staged \u003cfile\u003e...\" to unstage)\n        new file:   team.html\n\nDropped refs/stash@{0} (186fcc69be3695ca7ac6af456b548aedd1912f35)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git reset --hard\nHEAD is now at 4904368 Add home and about pages\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git status\nOn branch main\nYour branch is up to date with 'origin/main'.\n\nnothing to commit, working tree clean\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$\n```\n\n\u003cbr /\u003e\u003chr /\u003e\u003cbr /\u003e\n\n## Bundle 2\n### Exercise 1\n```bash\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout -b ft/bundle-2\nSwitched to a new branch 'ft/bundle-2'\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git branch\n  dev\n* ft/bundle-2\n  main\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ echo \"\u003ch1\u003eOur Services\u003c/h1\u003e\" \u003e services.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git status\nOn branch ft/bundle-2\nUntracked files:\n  (use \"git add \u003cfile\u003e...\" to include in what will be committed)\n        services.html\n\nnothing added to commit but untracked files present (use \"git add\" to track)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git add . \u0026\u0026 git commit -m \"Add services.html page\"\n[ft/bundle-2 e3b6ad4] Add services.html page\n 1 file changed, 1 insertion(+)\n create mode 100644 services.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git push origin -u ft/bundle-2\nEnumerating objects: 4, done.\nCounting objects: 100% (4/4), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (2/2), done.\nWriting objects: 100% (3/3), 305 bytes | 152.00 KiB/s, done.\nTotal 3 (delta 1), reused 0 (delta 0), pack-reused 0\nremote: Resolving deltas: 100% (1/1), completed with 1 local object.\nremote:\nremote: Create a pull request for 'ft/bundle-2' on GitHub by visiting:\nremote:      https://github.com/elyse502/Gym-Git-Exercise-Solutions/pull/new/ft/bundle-2\nremote:\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n * [new branch]      ft/bundle-2 -\u003e ft/bundle-2\nbranch 'ft/bundle-2' set up to track 'origin/ft/bundle-2'.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$\n```\n\n### Excercise 2\n```bash\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout main\nSwitched to branch 'main'\nYour branch is up to date with 'origin/main'.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout -b ft/service-redesign\nSwitched to a new branch 'ft/service-redesign'\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ vi services.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git status\nOn branch ft/service-redesign\nChanges not staged for commit:\n  (use \"git add \u003cfile\u003e...\" to update what will be committed)\n  (use \"git restore \u003cfile\u003e...\" to discard changes in working directory)\n        modified:   services.html\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git add . \u0026\u0026 git commit -m \"Add services we offer\"\n[ft/service-redesign 6088d7e] Add services we offer\n 1 file changed, 9 insertions(+)\n elysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git push origin -u ft/service-redesign\nEnumerating objects: 5, done.\nCounting objects: 100% (5/5), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (3/3), done.\nWriting objects: 100% (3/3), 346 bytes | 346.00 KiB/s, done.\nTotal 3 (delta 1), reused 0 (delta 0), pack-reused 0\nremote: Resolving deltas: 100% (1/1), completed with 1 local object.\nremote:\nremote: Create a pull request for 'ft/service-redesign' on GitHub by visiting:\nremote:      https://github.com/elyse502/Gym-Git-Exercise-Solutions/pull/new/ft/service-redesign\nremote:\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n * [new branch]      ft/service-redesign -\u003e ft/service-redesign\nbranch 'ft/service-redesign' set up to track 'origin/ft/service-redesign'.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout main\nSwitched to branch 'main'\nYour branch is up to date with 'origin/main'.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ echo \"\u003cp\u003eWe are here for you\u003c/p\u003e\" \u003e\u003e services.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ cat services.html\n\u003ch1\u003eOur Services\u003c/h1\u003e\n\u003cp\u003eWe are here for you\u003c/p\u003e\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git add . \u0026\u0026 git commit -m \"Add new changes\"\n[main 008a8d0] Add new changes\n 1 file changed, 1 insertion(+)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git push\nEnumerating objects: 5, done.\nCounting objects: 100% (5/5), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (2/2), done.\nWriting objects: 100% (3/3), 305 bytes | 305.00 KiB/s, done.\nTotal 3 (delta 1), reused 0 (delta 0), pack-reused 0\nremote: Resolving deltas: 100% (1/1), completed with 1 local object.\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n   5fda941..008a8d0  main -\u003e main\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git branch\n  dev\n  ft/bundle-2\n  ft/service-redesign\n* main\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout ft/service-redesign\nSwitched to branch 'ft/service-redesign'\nYour branch is up to date with 'origin/ft/service-redesign'.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git diff main..ft/service-redesign\ndiff --git a/services.html b/services.html\nindex d750762..c61b134 100644\n--- a/services.html\n+++ b/services.html\n@@ -1,2 +1,10 @@\n \u003ch1\u003eOur Services\u003c/h1\u003e\n-\u003cp\u003eWe are here for you\u003c/p\u003e\n+\u003cul\u003e\n+    \u003cli\u003eWeb Design\u003cli/\u003e\n+    \u003cli\u003eMobile App Development\u003cli/\u003e\n+    \u003cli\u003eGraphic Design\u003cli/\u003e\n+\u003c/ul\u003e\n+\n+\n+\n+\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git merge main\nAuto-merging services.html\nCONFLICT (content): Merge conflict in services.html\nAutomatic merge failed; fix conflicts and then commit the result.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git status\nOn branch ft/service-redesign\nYour branch is up to date with 'origin/ft/service-redesign'.\n\nYou have unmerged paths.\n  (fix conflicts and run \"git commit\")\n  (use \"git merge --abort\" to abort the merge)\n\nUnmerged paths:\n  (use \"git add \u003cfile\u003e...\" to mark resolution)\n        both modified:   services.html\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ vi services.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git add .; git commit\n[ft/service-redesign a2bd91c] Merge branch 'main' into ft/service-redesign\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git push\nEnumerating objects: 7, done.\nCounting objects: 100% (7/7), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (3/3), done.\nWriting objects: 100% (3/3), 363 bytes | 363.00 KiB/s, done.\nTotal 3 (delta 2), reused 0 (delta 0), pack-reused 0\nremote: Resolving deltas: 100% (2/2), completed with 2 local objects.\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n   6088d7e..a2bd91c  ft/service-redesign -\u003e ft/service-redesign\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$\n```\n\n\u003cbr /\u003e\u003chr /\u003e\u003cbr /\u003e\n\n## Bundle 3\n### Exercise 1\n```bash\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout -b ft/team-page\nSwitched to a new branch 'ft/team-page'\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ echo \"\u003ch1\u003eOur Team\u003c/h1\u003e\" \u003e team.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git status\nOn branch ft/team-page\nUntracked files:\n  (use \"git add \u003cfile\u003e...\" to include in what will be committed)\n        team.html\n\nnothing added to commit but untracked files present (use \"git add\" to track)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git add . \u0026\u0026 git commit -m \"Add Team Section\"\n[ft/team-page 78d7b16] Add Team Section\n 1 file changed, 1 insertion(+)\n create mode 100644 team.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git push origin -u ft/team-page\nEnumerating objects: 4, done.\nCounting objects: 100% (4/4), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (2/2), done.\nWriting objects: 100% (3/3), 296 bytes | 98.00 KiB/s, done.\nTotal 3 (delta 1), reused 0 (delta 0), pack-reused 0\nremote: Resolving deltas: 100% (1/1), completed with 1 local object.\nremote:\nremote: Create a pull request for 'ft/team-page' on GitHub by visiting:\nremote:      https://github.com/elyse502/Gym-Git-Exercise-Solutions/pull/new/ft/team-page\nremote:\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n * [new branch]      ft/team-page -\u003e ft/team-page\nbranch 'ft/team-page' set up to track 'origin/ft/team-page'.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout main\nSwitched to branch 'main'\nYour branch is up to date with 'origin/main'.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git branch ft/contact-page\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout ft/team-page\nSwitched to branch 'ft/team-page'\nYour branch is up to date with 'origin/ft/team-page'.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git log -1\ncommit 78d7b16b0cb391960de82e56077360a8a704e8fb (HEAD -\u003e ft/team-page, origin/ft/team-page)\nAuthor: elyse502 \u003celyseniyibizi502@gmail.com\u003e\nDate:   Wed Jun 18 11:02:07 2025 +0300\n\n    Add Team Section\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout ft/contact-page\nSwitched to branch 'ft/contact-page'\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git cherry-pick 78d7b16b0cb391960de82e56077360a8a704e8fb\n[ft/contact-page 253508f] Add Team Section\n Date: Wed Jun 18 11:02:07 2025 +0300\n 1 file changed, 1 insertion(+)\n create mode 100644 team.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ echo \"\u003ch1\u003eOur Contacts\u003c/h1\u003e\" \u003e contact.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git add . \u0026\u0026 git commit -m \"Add new changes\" \u0026\u0026 git push origin -u ft/contact-page\n[ft/contact-page a65e498] Add new changes\n 1 file changed, 1 insertion(+)\n create mode 100644 contact.html\nEnumerating objects: 7, done.\nCounting objects: 100% (7/7), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (4/4), done.\nWriting objects: 100% (6/6), 544 bytes | 108.00 KiB/s, done.\nTotal 6 (delta 2), reused 0 (delta 0), pack-reused 0\nremote: Resolving deltas: 100% (2/2), completed with 1 local object.\nremote:\nremote: Create a pull request for 'ft/contact-page' on GitHub by visiting:\nremote:      https://github.com/elyse502/Gym-Git-Exercise-Solutions/pull/new/ft/contact-page\nremote:\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n * [new branch]      ft/contact-page -\u003e ft/contact-page\nbranch 'ft/contact-page' set up to track 'origin/ft/contact-page'.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout -b ft/faq-page\nSwitched to a new branch 'ft/faq-page'\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ echo \"\u003ch1\u003eFAQ\u003c/h1\u003e\" \u003e faq.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git add . \u0026\u0026 git commit -m \"Create faq page\" \u0026\u0026 git pus\nh origin -u ft/faq-page\n[ft/faq-page e0efb60] Create faq page\n 1 file changed, 1 insertion(+)\n create mode 100644 faq.html\nEnumerating objects: 4, done.\nCounting objects: 100% (4/4), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (2/2), done.\nWriting objects: 100% (3/3), 279 bytes | 55.00 KiB/s, done.\nTotal 3 (delta 1), reused 0 (delta 0), pack-reused 0\nremote: Resolving deltas: 100% (1/1), completed with 1 local object.\nremote:\nremote: Create a pull request for 'ft/faq-page' on GitHub by visiting:\nremote:      https://github.com/elyse502/Gym-Git-Exercise-Solutions/pull/new/ft/faq-page\nremote:\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n * [new branch]      ft/faq-page -\u003e ft/faq-page\nbranch 'ft/faq-page' set up to track 'origin/ft/faq-page'.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git revert 78d7b16b0cb391960de82e56077360a8a704e8fb\n[ft/faq-page c3c5dbe] Revert \"Add Team Section\"\n 1 file changed, 1 deletion(-)\n delete mode 100644 team.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git status\nOn branch ft/faq-page\nYour branch is ahead of 'origin/ft/faq-page' by 1 commit.\n  (use \"git push\" to publish your local commits)\n\nnothing to commit, working tree clean\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git push\nEnumerating objects: 3, done.\nCounting objects: 100% (3/3), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (2/2), done.\nWriting objects: 100% (2/2), 276 bytes | 92.00 KiB/s, done.\nTotal 2 (delta 1), reused 0 (delta 0), pack-reused 0\nremote: Resolving deltas: 100% (1/1), completed with 1 local object.\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n   e0efb60..c3c5dbe  ft/faq-page -\u003e ft/faq-page\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$\n```\n\n### Exercise 2\n```bash\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout -b ft/home-page-redesign\nSwitched to a new branch 'ft/home-page-redesign'\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout main\nSwitched to branch 'main'\nYour branch is up to date with 'origin/main'.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ vi faq.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git status\nOn branch main\nYour branch is up to date with 'origin/main'.\n\nChanges not staged for commit:\n  (use \"git add \u003cfile\u003e...\" to update what will be committed)\n  (use \"git restore \u003cfile\u003e...\" to discard changes in working directory)\n        modified:   faq.html\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git add . \u0026\u0026 git commit -m \"Add new changes to faq page\" \u0026\u0026 git push\n[main 8988189] Add new changes to faq page\n 1 file changed, 4 insertions(+)\nEnumerating objects: 5, done.\nCounting objects: 100% (5/5), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (3/3), done.\nWriting objects: 100% (3/3), 349 bytes | 116.00 KiB/s, done.\nTotal 3 (delta 1), reused 0 (delta 0), pack-reused 0\nremote: Resolving deltas: 100% (1/1), completed with 1 local object.\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n   5fa6e42..8988189  main -\u003e main\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git checkout ft/home-page-redesign\nSwitched to branch 'ft/home-page-redesign'\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git rebase main\nSuccessfully rebased and updated refs/heads/ft/home-page-redesign.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ vi home.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git status\nOn branch ft/home-page-redesign\nChanges not staged for commit:\n  (use \"git add \u003cfile\u003e...\" to update what will be committed)\n  (use \"git restore \u003cfile\u003e...\" to discard changes in working directory)\n        modified:   home.html\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git add . \u0026\u0026 git commit -m \"Add new changes to home page\"\n[ft/home-page-redesign eac8e42] Add new changes to home page\n 1 file changed, 2 insertions(+)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$ git push origin -u ft/home-page-redesign\nEnumerating objects: 5, done.\nCounting objects: 100% (5/5), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (3/3), done.\nWriting objects: 100% (3/3), 322 bytes | 322.00 KiB/s, done.\nTotal 3 (delta 1), reused 0 (delta 0), pack-reused 0\nremote: Resolving deltas: 100% (1/1), completed with 1 local object.\nremote:\nremote: Create a pull request for 'ft/home-page-redesign' on GitHub by visiting:\nremote:      https://github.com/elyse502/Gym-Git-Exercise-Solutions/pull/new/ft/home-page-redesign\nremote:\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n * [new branch]      ft/home-page-redesign -\u003e ft/home-page-redesign\nbranch 'ft/home-page-redesign' set up to track 'origin/ft/home-page-redesign'.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/Gym-Git-Exercise-Solutions$\n```\n\n\u003cbr /\u003e\u003chr /\u003e\u003cbr /\u003e\n\n## Bundle 4\n### Exercise 1\n```bash\nelysee@DESKTOP-73EL1TL:~$ cd the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git status\nOn branch main\nYour branch is up to date with 'origin/main'.\n\nnothing to commit, working tree clean\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git branch\n  dev\n  ft/bundle-2\n  ft/contact-page\n  ft/faq-page\n  ft/home-page-redesign\n  ft/service-redesign\n  ft/team-page\n* main\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git fetch; git pull\nAlready up to date.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git remote add git-copy https://github.com/elyse502/Gym-Git-Exercise-Solutions-copy.git\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git remote -v\ngit-copy        https://github.com/elyse502/Gym-Git-Exercise-Solutions-copy.git (fetch)\ngit-copy        https://github.com/elyse502/Gym-Git-Exercise-Solutions-copy.git (push)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ ls\nREADME.md  about.html  contact.html  faq.html  home.html  services.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ vi home.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git status\nOn branch main\nYour branch is up to date with 'origin/main'.\n\nChanges not staged for commit:\n  (use \"git add \u003cfile\u003e...\" to update what will be committed)\n  (use \"git restore \u003cfile\u003e...\" to discard changes in working directory)\n        modified:   home.html\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git add .; git commit -m \"Updated home page\"\n[main 53f3441] Updated home page\n 1 file changed, 4 insertions(+), 2 deletions(-)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git push origin main\nEnumerating objects: 5, done.\nCounting objects: 100% (5/5), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (3/3), done.\nWriting objects: 100% (3/3), 324 bytes | 162.00 KiB/s, done.\nTotal 3 (delta 1), reused 0 (delta 0), pack-reused 0\nremote: Resolving deltas: 100% (1/1), completed with 1 local object.\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n   75bd185..53f3441  main -\u003e main\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git push git-copy main\nUsername for 'https://github.com': elyse502\nPassword for 'https://elyse502@github.com':\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions-copy.git\n ! [rejected]        main -\u003e main (fetch first)\nerror: failed to push some refs to 'https://github.com/elyse502/Gym-Git-Exercise-Solutions-copy.git'\nhint: Updates were rejected because the remote contains work that you do not\nhint: have locally. This is usually caused by another repository pushing to\nhint: the same ref. If you want to integrate the remote changes, use\nhint: 'git pull' before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git push --force git-copy main\nUsername for 'https://github.com': elyse502\nPassword for 'https://elyse502@github.com':\nEnumerating objects: 65, done.\nCounting objects: 100% (65/65), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (55/55), done.\nWriting objects: 100% (65/65), 13.89 KiB | 677.00 KiB/s, done.\nTotal 65 (delta 21), reused 0 (delta 0), pack-reused 0\nremote: Resolving deltas: 100% (21/21), done.\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions-copy.git\n + 72d3960...53f3441 main -\u003e main (forced update)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ ls\nREADME.md  about.html  contact.html  faq.html  home.html  services.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$\n```\n\n### Exercise 2\n```bash\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git branch\n  dev\n  ft/bundle-2\n  ft/contact-page\n  ft/faq-page\n  ft/home-page-redesign\n  ft/service-redesign\n  ft/team-page\n* main\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git checkout -b ft/footer\nSwitched to a new branch 'ft/footer'\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ ls\nREADME.md  about.html  contact.html  faq.html  home.html  services.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ vi services.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git status\nOn branch ft/footer\nChanges not staged for commit:\n  (use \"git add \u003cfile\u003e...\" to update what will be committed)\n  (use \"git restore \u003cfile\u003e...\" to discard changes in working directory)\n        modified:   services.html\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git add .; git commit -m \"Add new changes\"\n[ft/footer 1d1b464] Add new changes\n 1 file changed, 9 insertions(+), 8 deletions(-)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ vi services.html\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git status\nOn branch ft/footer\nChanges not staged for commit:\n  (use \"git add \u003cfile\u003e...\" to update what will be committed)\n  (use \"git restore \u003cfile\u003e...\" to discard changes in working directory)\n        modified:   services.html\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git add .; git commit -m \"Add second chang\ne\"\n[ft/footer 6fd0e47] Add second change\n 1 file changed, 1 insertion(+), 1 deletion(-)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git push origin ft/footer\nEnumerating objects: 8, done.\nCounting objects: 100% (8/8), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (6/6), done.\nWriting objects: 100% (6/6), 628 bytes | 314.00 KiB/s, done.\nTotal 6 (delta 3), reused 0 (delta 0), pack-reused 0\nremote: Resolving deltas: 100% (3/3), completed with 1 local object.\nremote:\nremote: Create a pull request for 'ft/footer' on GitHub by visiting:\nremote:      https://github.com/elyse502/Gym-Git-Exercise-Solutions/pull/new/ft/footer\nremote:\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n * [new branch]      ft/footer -\u003e ft/footer\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git checkout main\nSwitched to branch 'main'\nYour branch is up to date with 'origin/main'.\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git checkout -b ft/squashing\nSwitched to a new branch 'ft/squashing'\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git merge --squash ft/footer\nUpdating 956b83a..6fd0e47\nFast-forward\nSquash commit -- not updating HEAD\n services.html | 17 +++++++++--------\n 1 file changed, 9 insertions(+), 8 deletions(-)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git commit -m \"service page changes squashing\"\n[ft/squashing bd8b638] service page changes squashing\n 1 file changed, 9 insertions(+), 8 deletions(-)\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$ git push origin ft/squashing\nEnumerating objects: 5, done.\nCounting objects: 100% (5/5), done.\nDelta compression using up to 4 threads\nCompressing objects: 100% (3/3), done.\nWriting objects: 100% (3/3), 390 bytes | 195.00 KiB/s, done.\nTotal 3 (delta 1), reused 0 (delta 0), pack-reused 0\nremote: Resolving deltas: 100% (1/1), completed with 1 local object.\nremote:\nremote: Create a pull request for 'ft/squashing' on GitHub by visiting:\nremote:      https://github.com/elyse502/Gym-Git-Exercise-Solutions/pull/new/ft/squashing\nremote:\nTo https://github.com/elyse502/Gym-Git-Exercise-Solutions.git\n * [new branch]      ft/squashing -\u003e ft/squashing\nelysee@DESKTOP-73EL1TL:~/the-gym-uok/2-sprint/git/Gym-Git-Exercise-Solutions$\n```\n\n\n\n\n\n\n\n\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Felyse502%2Fgym-git-exercise-solutions","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Felyse502%2Fgym-git-exercise-solutions","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Felyse502%2Fgym-git-exercise-solutions/lists"}