Re:Comparing Git Workflows
by jedberg on Thursday May 26, 2016 @11:09AM
(#11778497)
A couple weeks ago GitHub added merge squash as an option for accepting pull requests (via the UI, you could always do it manually). As long as you don't delete the feature branch you'll still have the history of iterations in that branch.
[ Parent
| on HN ]
Re:Comparing Git Workflows
by heavenlyhash on Thursday May 26, 2016 @04:33PM
(#11781318)
> As long as you don't delete the feature branch
This, unfortunately, is not a great thing to propose.
Many of git's operations on refs are basically O(n). You really don't want to accumulate an unbounded number of them over time.
I agree with you, but I was responding to the request to keep "all the history". My understanding is the ref count would be the same if you merge in all the history or keep the branches around, so in those cases it wouldn't make a difference. I could be wrong though -- I don't know enough about git internals to know if one is worse than the other.