{"id":22348614,"url":"https://github.com/mvelosop/git-workshop","last_synced_at":"2026-05-16T21:11:00.655Z","repository":{"id":231710702,"uuid":"780655694","full_name":"mvelosop/git-workshop","owner":"mvelosop","description":"Sample Git scenario for workshop","archived":false,"fork":false,"pushed_at":"2024-04-18T15:34:01.000Z","size":188,"stargazers_count":0,"open_issues_count":0,"forks_count":0,"subscribers_count":1,"default_branch":"main","last_synced_at":"2025-09-21T07:54:27.104Z","etag":null,"topics":["git","merging","revert-commit"],"latest_commit_sha":null,"homepage":"","language":"Shell","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"mit","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/mvelosop.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":"LICENSE","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}},"created_at":"2024-04-01T23:06:05.000Z","updated_at":"2024-04-05T12:55:50.000Z","dependencies_parsed_at":"2024-04-05T13:57:57.206Z","dependency_job_id":null,"html_url":"https://github.com/mvelosop/git-workshop","commit_stats":null,"previous_names":["mvelosop/git-workshop"],"tags_count":0,"template":false,"template_full_name":null,"purl":"pkg:github/mvelosop/git-workshop","repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/mvelosop%2Fgit-workshop","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/mvelosop%2Fgit-workshop/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/mvelosop%2Fgit-workshop/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/mvelosop%2Fgit-workshop/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/mvelosop","download_url":"https://codeload.github.com/mvelosop/git-workshop/tar.gz/refs/heads/main","sbom_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/mvelosop%2Fgit-workshop/sbom","scorecard":null,"host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":286080680,"owners_count":33119024,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2026-05-16T18:38:32.183Z","status":"ssl_error","status_checked_at":"2026-05-16T18:38:29.903Z","response_time":115,"last_error":"SSL_read: unexpected eof while reading","robots_txt_status":"success","robots_txt_updated_at":"2025-07-24T06:49:26.215Z","robots_txt_url":"https://github.com/robots.txt","online":false,"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","merging","revert-commit"],"created_at":"2024-12-04T10:24:07.123Z","updated_at":"2026-05-16T21:11:00.640Z","avatar_url":"https://github.com/mvelosop.png","language":"Shell","funding_links":[],"categories":[],"sub_categories":[],"readme":"# Git Workshop\n\nThis repo is a showcase to one scenario of \"disappearing\" updates in git, so that you can:\n\n- Reflect on what happened\n- Find a solution\n- Extract a lesson\n\n## Content\n\n- A `scripts` folder for... you can guess... (Mac OS, Linux)\n- A `scenarios` folder for, well, the scenarios\n- A `code` folder that contains the code changes used in the scenarios\n\n## Quick run\n\n1. Run the `chmod+x.sh` to give execute permission to all scripts. (You'll have to give execute permission to this one first, of course.)\n2. Go to the `scripts` folder\n3. Run the command: `source set-path.sh` to add the scripts folder to the PATH for the session.\n4. Go the `scenarios/4-merge-and-revert` folder\n   - You'll see the scenario better if you open a new editor session in this folder  \n5. Run the `./CLEAN.sh` script to get a clean start.\n6. Run the `./RUN-merge-and-revert.sh`, read the messages and follow the prompts\n   - Explore the git branches as you execute each step\n   - After executing the last step, the changes introduced in step 3 will be gone without a warning or conflict!\n\n## Get the answers\n\n- Why did this happen?\n- How could it be avoided?\n- How would you solve this (without coding it back by hand)?\n- What lessons can you extract from this scenario?\n\n## Troubleshooting\n\nIf you don't get something like this when running step 6 above:\n\n![](images/initial-run.png)\n\nIt's probable that:\n\n- The scripts don't have execute permission (step 1 above)\n- The `scripts` folder isn't in the current PATH (step 3 above)\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fmvelosop%2Fgit-workshop","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fmvelosop%2Fgit-workshop","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fmvelosop%2Fgit-workshop/lists"}