{"id":49635389,"url":"https://github.com/renswickd/merge-conflict-explore","last_synced_at":"2026-05-05T14:34:40.331Z","repository":{"id":334476059,"uuid":"1109758711","full_name":"renswickd/merge-conflict-explore","owner":"renswickd","description":"One-stop repo to understand git conflict with hands-on tutorials","archived":false,"fork":false,"pushed_at":"2026-04-08T04:42:53.000Z","size":75,"stargazers_count":0,"open_issues_count":0,"forks_count":0,"subscribers_count":0,"default_branch":"main","last_synced_at":"2026-04-08T06:25:25.268Z","etag":null,"topics":["git","git-commands","git-merge","git-merge-conflicts"],"latest_commit_sha":null,"homepage":"","language":null,"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/renswickd.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-12-04T08:43:13.000Z","updated_at":"2026-04-08T04:42:57.000Z","dependencies_parsed_at":null,"dependency_job_id":null,"html_url":"https://github.com/renswickd/merge-conflict-explore","commit_stats":null,"previous_names":["renswickd/merge-conflict-explore"],"tags_count":0,"template":false,"template_full_name":null,"purl":"pkg:github/renswickd/merge-conflict-explore","repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/renswickd%2Fmerge-conflict-explore","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/renswickd%2Fmerge-conflict-explore/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/renswickd%2Fmerge-conflict-explore/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/renswickd%2Fmerge-conflict-explore/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/renswickd","download_url":"https://codeload.github.com/renswickd/merge-conflict-explore/tar.gz/refs/heads/main","sbom_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/renswickd%2Fmerge-conflict-explore/sbom","scorecard":null,"host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":286080680,"owners_count":32653654,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2026-05-05T11:29:49.557Z","status":"ssl_error","status_checked_at":"2026-05-05T11:29:48.587Z","response_time":54,"last_error":"SSL_connect returned=1 errno=0 peeraddr=140.82.121.5:443 state=error: 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","git-commands","git-merge","git-merge-conflicts"],"created_at":"2026-05-05T14:34:39.215Z","updated_at":"2026-05-05T14:34:40.322Z","avatar_url":"https://github.com/renswickd.png","language":null,"funding_links":[],"categories":[],"sub_categories":[],"readme":"# Why this Repo?\nA hands-on conflict lab sessions for intermediate developers to understand Git merges, rebases, and conflict resolution.\n\u003e This is NOT a beginner Git tutorial. It assumes you already know `clone`, `add`, `commit`, and `push`.\n\n## Repository Structure\n```\nmerge-conflict-explore/\n│\n├── README.md\n│\n├── 00-git-mental-models/\n│   ├── README.md\n│   ├── commit-graph.md\n│   ├── three-way-merge.md\n│   └── index-vs-working-tree.md\n│\n├── 01-basic-conflicts/\n│   ├── README.md\n│   ├── same-line-conflict/\n│   ├── adjacent-lines-conflict/\n│   └── whitespace-conflict/\n│\n├── 02-real-world-conflicts/\n│   ├── README.md\n│   ├── long-lived-branch/\n│   ├── rebasing-conflicts/\n│   ├── cherry-pick-conflicts/\n│   └── conflict-after-pull/\n│\n├── 03-rename-and-move-conflicts/\n│   ├── README.md\n│   ├── file-rename-vs-edit/\n│   └── directory-move-conflict/\n│\n├── 04-advanced-scenarios/\n│   ├── README.md\n│   ├── binary-files/\n│   ├── lock-files/\n│   ├── generated-files/\n│   └── submodule-conflicts/\n│\n├── 05-resolution-strategies/\n│   ├── README.md\n│   ├── manual-resolution/\n│   ├── ours-theirs/\n│   ├── rerere/\n│   └── merge-tools/\n│\n├── 06-team-workflows/\n│   ├── README.md\n│   ├── gitflow-conflicts/\n│   ├── trunk-based-conflicts/\n│   └── monorepo-conflicts/\n│\n├── scripts/\n│   ├── reset-scenario.sh\n│   └── create-conflict.sh\n│\n└── blog-outline/\n│   └── series-outline.md\n├── demo/\n│   ├── demo-files\n```\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Frenswickd%2Fmerge-conflict-explore","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Frenswickd%2Fmerge-conflict-explore","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Frenswickd%2Fmerge-conflict-explore/lists"}