{"id":26222248,"url":"https://github.com/walles/conflicts","last_synced_at":"2025-12-28T02:10:26.120Z","repository":{"id":54860404,"uuid":"332520339","full_name":"walles/conflicts","owner":"walles","description":"Experiments in git conflicts resolution support","archived":false,"fork":false,"pushed_at":"2021-01-27T18:34:42.000Z","size":12,"stargazers_count":0,"open_issues_count":1,"forks_count":0,"subscribers_count":2,"default_branch":"main","last_synced_at":"2023-03-31T12:06:25.423Z","etag":null,"topics":[],"latest_commit_sha":null,"homepage":null,"language":"Python","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/walles.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-01-24T18:10:12.000Z","updated_at":"2021-01-27T18:34:45.000Z","dependencies_parsed_at":"2022-08-14T05:00:41.776Z","dependency_job_id":null,"html_url":"https://github.com/walles/conflicts","commit_stats":null,"previous_names":[],"tags_count":null,"template":null,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/walles%2Fconflicts","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/walles%2Fconflicts/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/walles%2Fconflicts/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/walles%2Fconflicts/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/walles","download_url":"https://codeload.github.com/walles/conflicts/tar.gz/refs/heads/main","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":243258493,"owners_count":20262297,"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":"2025-03-12T16:51:39.569Z","updated_at":"2025-12-28T02:10:26.071Z","avatar_url":"https://github.com/walles.png","language":"Python","funding_links":[],"categories":[],"sub_categories":[],"readme":"# Git conflict resolution experiments\n\nRun `./show-original-change.sh` on a git repo with conflicts to display your\noriginal change that is causing a conflict.\n\n## Testing\n\nRun `./test-show-original-change.py` to test `show-original-change.sh` on\nvarious forms of conflicts.\n\n# TODO\n\n- Test a conflict in a file with spaces in its name\n\n## DONE\n\n- Add test for delete-edit conflict\n- Add test for cherry picking conflicts\n- Add test for edit-delete conflict\n- Add test for when a new file is added in both branches, but with different\n  contents\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fwalles%2Fconflicts","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fwalles%2Fconflicts","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fwalles%2Fconflicts/lists"}