Merge branch 'master' into redesign-2015
Description
Description
Details
Details
- Group Auditors
Cowboy Commits - Provenance
epriestley Authored on epriestley Pushed on May 14 2015, 4:50 PM - Parents
- rPf233672feb52: Multi-day non-all-day events should be displayed on middle day day views
rPb39aa9162ba7: [Redesign] Update PHUIInfoView style, color - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Comment Actions
Tangential question: For the rare public-long-lived-topic-branch why merge over rebase?
Comment Actions
For unpublished branches, I feel like I generally have a harder time managing conflicts when repeatedly rebasing a long-lived topic branch versus repeatedly merging it, and I think rebasing takes longer? Maybe that's a figment of my imagination since I rarely ever do this. Concretely, in this case, git merge is clean but git rebase fails once (although it fails when rebasing a now-obsolete merge which has become empty).
For published branches like this one, I don't want to rewrite published commits / perform non-fastforward pushes to published branches.
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- ae32d1afb87a Remove unused file transformsAuthor
- c4dfc097c8c9 First pass at Month ViewAuthorRevisions