{"id":18622779,"url":"https://github.com/timonus/rebaseexample","last_synced_at":"2025-11-03T16:30:24.081Z","repository":{"id":21597128,"uuid":"24917267","full_name":"timonus/RebaseExample","owner":"timonus","description":"Sample code that will be used to demonstrate how git rebase works.","archived":false,"fork":false,"pushed_at":"2014-10-08T23:12:18.000Z","size":164,"stargazers_count":1,"open_issues_count":0,"forks_count":0,"subscribers_count":3,"default_branch":"master","last_synced_at":"2025-02-18T01:38:36.411Z","etag":null,"topics":[],"latest_commit_sha":null,"homepage":null,"language":"Objective-C","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/timonus.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":"2014-10-08T00:07:03.000Z","updated_at":"2014-10-16T20:56:51.000Z","dependencies_parsed_at":"2022-08-21T19:40:49.637Z","dependency_job_id":null,"html_url":"https://github.com/timonus/RebaseExample","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/timonus%2FRebaseExample","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/timonus%2FRebaseExample/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/timonus%2FRebaseExample/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/timonus%2FRebaseExample/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/timonus","download_url":"https://codeload.github.com/timonus/RebaseExample/tar.gz/refs/heads/master","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":239418547,"owners_count":19635203,"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-07T04:18:38.084Z","updated_at":"2025-11-03T16:30:24.031Z","avatar_url":"https://github.com/timonus.png","language":"Objective-C","funding_links":[],"categories":[],"sub_categories":[],"readme":"# Rebase Sample\n\nThis is a sample project for demonstrating how to use git rebase. On master, there's a view controller with two views that alternate colors. On a branch named add-cat-button there are some other changes that add a button that, when tapped, shows a cat picture.\n\nThe workflow for demonstrating this is:\n\n- Show that commit with message \"Make imageView's content mode scaleAspectFit.\" is out of order.\n- Show that commit with message \"Add button and imageView.\" should be split into two commits.\n- Show that commit with message \"Add cat pic getter.\" should be merged with the commit that introduces the button *or* before it.\n\nPerform an interactive rebase:\n\n- Move \"Make imageView's content mode scaleAspectFit.\" to the end by reordering commits.\n- Split \"Add button and imageView.\" into to commits using the `edit` option.\n- Merge \"Add cat pic getter.\" with the commit that introduces the button using the `fixup` option.\n\nRebase and merge with master:\n\n- Resolve conflicts along the way, there are a few.\n- Merge into master `using --no-ff`\n\nIn the end you should have a pulsating background view with a cat pic button that shows a cat when tapped.\n\n![](http://cl.ly/image/3P0O1x3k1j3U/gif.gif)\n\nTo reset state for this example reset add-cat-button back to add-cat-button-pristine and reset master back to master-pristine.\n\nSlide deck for this available [here](http://cl.ly/451B1C2C3P3Q).","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Ftimonus%2Frebaseexample","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Ftimonus%2Frebaseexample","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Ftimonus%2Frebaseexample/lists"}