Recommended
More Related Content
Similar to Auto rebase
Similar to Auto rebase (20)
Recently uploaded
Recently uploaded (20)
Auto rebase
- 1. Auto-rebase © Copyright 2012 Hewlett-Packard Development Company, L.P. The information contained herein is subject to change without notice.
- 2. Handling Multiple Changes Using 7 DVR patches as an example • Dependency Order Not Linear • Should it be? (I don’t think so) • The pain comes mostly from the depth of the chain • Avoid Dependencies at all Costs? • There are legitimate use cases for dependency chains • Keep the depth under control © Copyright 2012 Hewlett-Packard Development Company, L.P. The information contained herein is subject 2 to change without notice.
- 3. Handling Multiple Changes It is Never Linear!!! This is what the dependency chain really looks like. © Copyright 2012 Hewlett-Packard Development Company, L.P. The information contained herein is subject 3 to change without notice.
- 4. Handling Multiple Changes Enemy Number One! • Automatic rebase feature • Default behavior of “git review” • Most of the time it is disruptive • Sometimes it is destructive! • Go to the next slide to see what happens © Copyright 2012 Hewlett-Packard Development Company, L.P. The information contained herein is subject 4 to change without notice.
- 5. Handling Multiple Changes Enemy Number One! • L3 Agent/21 is new • Clobbered API Extension!! • PS11 was rebased from PS5 • PS6-PS10 are clobbered by PS11 • I’ve dealt with this more than once • Use --no-rebase Always © Copyright 2012 Hewlett-Packard Development Company, L.P. The information contained herein is subject 5 to change without notice.