I am not trying to put myself out here as an expert; far from it. Rather, I wanted to share how I've been doing things and seeing if people think, "yeah, that's

I am not trying to put myself out here as an expert; far from it. Rather, I wanted to share how I've been doing things and seeing if people think, "yeah, that's pretty much it" or "no its totally wrong". For the record, I understand and empathize with the camp who responds "well, you shouldn't be squashing/rebasing at all; all git activity should be a commit or a merge." I am operating in the context where the main branch's commit history must be linear -- it is a customer/manager constraint. I hope to discuss options inside this paradigm.