2 ms·
I think this nails the difference in my workflow against people that tend to say it is difficult. In infrastructure commit history, which is often tied to CI CD
by JohnMakin 2y ago
I think this nails the difference in my workflow against people that tend to say it is difficult. In infrastructure commit history, which is often tied to CI CD processes that reach far outside of a repository and org - commit history is sacred. I need the absolute order of when things got merged in, because it provides a clean timeline to backtrack any issues. maybe I’m doing it wrong but every mature sysyem I’ve worked in basically operates this way. I suspect you run into more merge conflicts but I’m by no means a git expert.
- AlotOfReading 2y agoThe best I've found is the kernel development process: use both intelligently and give your branches a clean commit history before they're sent for review. https://docs.kernel.org/maintainer/rebasing-and-merging.html https://docs.kernel.org/maintainer/rebasing-and-merging.html