{"id":17037212,"url":"https://github.com/bast/demo-git-conflict","last_synced_at":"2025-03-22T23:13:21.578Z","repository":{"id":52159738,"uuid":"364986116","full_name":"bast/demo-git-conflict","owner":"bast","description":"Copy of https://github.com/ResearchSoftwareHour/demo-git-conflict which I will use during stream.","archived":false,"fork":false,"pushed_at":"2021-05-06T19:14:52.000Z","size":4,"stargazers_count":1,"open_issues_count":0,"forks_count":0,"subscribers_count":2,"default_branch":"main","last_synced_at":"2025-01-28T02:42:47.179Z","etag":null,"topics":[],"latest_commit_sha":null,"homepage":null,"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/bast.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}},"created_at":"2021-05-06T17:22:28.000Z","updated_at":"2021-08-23T18:16:14.000Z","dependencies_parsed_at":"2022-08-28T15:52:28.850Z","dependency_job_id":null,"html_url":"https://github.com/bast/demo-git-conflict","commit_stats":null,"previous_names":[],"tags_count":0,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/bast%2Fdemo-git-conflict","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/bast%2Fdemo-git-conflict/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/bast%2Fdemo-git-conflict/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/bast%2Fdemo-git-conflict/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/bast","download_url":"https://codeload.github.com/bast/demo-git-conflict/tar.gz/refs/heads/main","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":245031516,"owners_count":20549925,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","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":[],"created_at":"2024-10-14T08:53:10.385Z","updated_at":"2025-03-22T23:13:21.553Z","avatar_url":"https://github.com/bast.png","language":null,"funding_links":[],"categories":[],"sub_categories":[],"readme":"# Example to discuss and practice Git conflict resolution\n\nThere are two branches in addition to `main`: `improve-starters` and `improve-desserts`\nand you can try these steps to discuss and practice conflict resolution:\n\n- merging first `improve-starters` into `main`, then `improve-desserts` into `main`\n- merging first `improve-desserts` into `main`, then `improve-starters` into `main`\n- merging `improve-desserts` into `improve-starters` and vice versa\n\nYou can abort merges with `git merge --abort` and rewind `main` back with `git reset --hard origin/main`.\n\nAlso try to rebase the branches on top of `main`, \"behind\" each other.\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fbast%2Fdemo-git-conflict","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fbast%2Fdemo-git-conflict","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fbast%2Fdemo-git-conflict/lists"}