https://github.com/timonus/rebaseexample
Sample code that will be used to demonstrate how git rebase works.
https://github.com/timonus/rebaseexample
Last synced: 7 months ago
JSON representation
Sample code that will be used to demonstrate how git rebase works.
- Host: GitHub
- URL: https://github.com/timonus/rebaseexample
- Owner: timonus
- Created: 2014-10-08T00:07:03.000Z (over 11 years ago)
- Default Branch: master
- Last Pushed: 2014-10-08T23:12:18.000Z (over 11 years ago)
- Last Synced: 2025-02-18T01:38:36.411Z (over 1 year ago)
- Language: Objective-C
- Size: 160 KB
- Stars: 1
- Watchers: 3
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: readme.md
Awesome Lists containing this project
README
# Rebase Sample
This 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.
The workflow for demonstrating this is:
- Show that commit with message "Make imageView's content mode scaleAspectFit." is out of order.
- Show that commit with message "Add button and imageView." should be split into two commits.
- Show that commit with message "Add cat pic getter." should be merged with the commit that introduces the button *or* before it.
Perform an interactive rebase:
- Move "Make imageView's content mode scaleAspectFit." to the end by reordering commits.
- Split "Add button and imageView." into to commits using the `edit` option.
- Merge "Add cat pic getter." with the commit that introduces the button using the `fixup` option.
Rebase and merge with master:
- Resolve conflicts along the way, there are a few.
- Merge into master `using --no-ff`
In the end you should have a pulsating background view with a cat pic button that shows a cat when tapped.
To reset state for this example reset add-cat-button back to add-cat-button-pristine and reset master back to master-pristine.
Slide deck for this available [here](http://cl.ly/451B1C2C3P3Q).