On Fri, Dec 12, 2014 at 02:15:21PM -0500, Andrew Stitcher wrote: > On Thu, 2014-12-11 at 17:11 -0500, Darryl L. Pierce wrote: > > Additionally, while working on a task branch, to resynch with master do > > a rebase: > > > > $ rebase -i master > > > > rather than merging master down onto your task branch. I saw a *lot* of > > that while examining the merge commits. Rebasing is by far one of the > > most awesome features of git. > > I agree and disagree with this simplistic position. > > If (and only if) your task branch is yours and yours alone and no one > has ever relied on it then you can safely rebase it. Actually I find > that rebasing is a lot more useful to get my commits in a logical > sequence of smaller working commits (by using rebase -i).
Sorry, I should have clarified that this is my assumption, that a task branch is a private branch that you are working on and not one you're sharing with others. > On the other hand merging topic branches into master is also perfectly > sensible to finish off work on a topic branch especially a long lived > one. > > A long lived topic branch will necessarily have some level of merging > from master to keep it up to date. > > On the other hand I agree that merging from master just before merging > to master is irritating and pointless. > > Andrew > > -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Delivering value year after year. Red Hat ranks #1 in value among software vendors. http://www.redhat.com/promo/vendor/
pgpXSHYo3efcH.pgp
Description: PGP signature
