{"id":18881475,"url":"https://github.com/desktop/rebase-test-cases","last_synced_at":"2026-02-21T03:30:16.198Z","repository":{"id":66344093,"uuid":"169263026","full_name":"desktop/rebase-test-cases","owner":"desktop","description":null,"archived":false,"fork":false,"pushed_at":"2019-04-23T14:25:58.000Z","size":39,"stargazers_count":6,"open_issues_count":0,"forks_count":16,"subscribers_count":7,"default_branch":"master","last_synced_at":"2024-12-31T03:27:34.874Z","etag":null,"topics":[],"latest_commit_sha":null,"homepage":null,"language":null,"has_issues":false,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"unlicense","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/desktop.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,"publiccode":null,"codemeta":null}},"created_at":"2019-02-05T15:27:34.000Z","updated_at":"2022-05-08T08:14:47.000Z","dependencies_parsed_at":"2023-04-20T01:30:49.023Z","dependency_job_id":null,"html_url":"https://github.com/desktop/rebase-test-cases","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/desktop%2Frebase-test-cases","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/desktop%2Frebase-test-cases/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/desktop%2Frebase-test-cases/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/desktop%2Frebase-test-cases/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/desktop","download_url":"https://codeload.github.com/desktop/rebase-test-cases/tar.gz/refs/heads/master","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":239850447,"owners_count":19707348,"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-11-08T06:49:36.295Z","updated_at":"2026-02-21T03:30:16.130Z","avatar_url":"https://github.com/desktop.png","language":null,"funding_links":[],"categories":[],"sub_categories":[],"readme":"# rebase-test-cases\n\nThis repository contains a number of rebase test cases, tailored to ensure GitHub Desktop handles them appropriately as part of the upcoming rebase workflows.\n\nIn all scenarios where a conflict is encountered, the user should be able to abort the rebase which returns them to the target branch.\n\n## Scenarios\n\n### Simple Rebase\n\n - [simple rebase without conflicts](https://github.com/desktop/rebase-test-cases/tree/1-simple-rebase-base-branch/1-simple-rebase-no-conflicts)\n    - changes in the target branch do not overlap with the base branch\n    - Desktop should display the rebase progress (even for a simple rebase), and then indicate the rebase completed without encountering conflicts\n - [simple rebase with simple conflict](https://github.com/desktop/rebase-test-cases/tree/2-simple-rebase-conflict-base-branch/2-simple-rebase-conflict)\n    - changes in the target branch overlap with work in the base branch\n    - Desktop should display the rebase progress, ask the user to resolve a conflict, then indicate the rebase has completed\n - [simple rebase with multiple conflicts](https://github.com/desktop/rebase-test-cases/tree/3-simple-rebase-multiple-conflicts-baseline/3-simple-rebase-multiple-conflicts)\n    - changes in the target branch overlap with work in the base branch and need significant work to resolve\n    - Desktop should display the rebase progress, ask the user to resolve a conflict whenever the rebase stops, then indicate the rebase has completed\n\n### Manual resolution\n\n - [base branch deleted file, target branch modifies it](https://github.com/desktop/rebase-test-cases/tree/4-manual-conflict-resolution-baseline/4-manual-conflict-resolution)\n    - conflict detected, but no text-base resolution available\n    - Desktop should ask user which version of the file to use\n    - application sets the right version and continues the rebase\n\n### Edge cases\n\n - [gitignore change on base branch](https://github.com/desktop/rebase-test-cases/tree/5-gitignore-base-branch/5-gitignore-on-base-branch)\n   - `gitignore` rules on base branch which clashes with target branch commits\n   - tracked file matching pattern is included\n   - untracked file matching pattern is hidden\n\n### Complex Rebase\n\n- complex rebase without conflicts\n    - changes in the target branch do not overlap with the base branch\n    - Desktop should display the rebase progress, and then indicate it has completed\n - complex rebase with simple conflict\n    - changes in the target branch overlap with work in the base branch\n    - Desktop should display the rebase progress, ask the user to resolve a conflict, then indicate the rebase has completed\n - complex rebase with multiple conflicts\n    - changes in the target branch overlap with work in the base branch and need significant work to resolve\n    - Desktop should display the rebase progress, ask the user to resolve a conflict whenever the rebase stops, then indicate\n\n### Rebase with binary files\n\n - both branches modify the same image\n    - conflict detected\n    - application asks user to choose which version of the file to use\n    - application sets the right version and continues the rebase\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fdesktop%2Frebase-test-cases","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fdesktop%2Frebase-test-cases","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fdesktop%2Frebase-test-cases/lists"}