Re: [git-users] Question about when to merge master into my feature branch

2015-12-28 Thread Ben Rubinger
Hi Steve, Thanks for your reply. Your input is helpful. I've spent the past five days reading through this book: http://www.amazon.com/gp/product/B008Y4OR3A My hesitancy around rebasing was around the fact that (if I understood correctly) all rebased checkins are deltas, having different hashe

Re: [git-users] Question about when to merge master into my feature branch

2015-12-28 Thread Philip Oakley
Hi Ben, Rebase is a good way to go. I see you have a couple of misunderstandings / false viewpoints that are common. Git does not use deltas at its primary interface. Yes, there are lots of internal implementation details that use deltas, along with often showing diffs between commits, but aft

Re: [git-users] Question about when to merge master into my feature branch

2015-12-28 Thread Magnus Therning
Ben Rubinger writes: > Hi Steve, > > Thanks for your reply. Your input is helpful. I've spent the past five > days reading through this book: > > http://www.amazon.com/gp/product/B008Y4OR3A > > My hesitancy around rebasing was around the fact that (if I understood > correctly) all rebased checkin