I was trying to learn this again last week. I just play around with this stuff for fun.
If I want to consolidate all the commits into a a single message (to create a changelog sort of), which kind of merge do I use?
Another question: I’m torn between wanting to keep a complete history of my work, for my own benefit, and not wanting anyone to see how messy and crappy everything is. I’ve been trying to work in one branch then merge only when a task is “complete”. But it’s a bit confusing for me especially if I leave a project for a while then come back to it. Especially especially if submodules are involved. Is there some sort of convention about how to do this? Or am I thinking about it wrong?
![[Julia Evans] Combining Branches](https://programming.dev/pictrs/image/0fe7c7bd-b762-453f-bac7-ed2e34d44ba0.png){kind=link}
I was trying to learn this again last week. I just play around with this stuff for fun.
If I want to consolidate all the commits into a a single message (to create a changelog sort of), which kind of merge do I use?
Another question: I’m torn between wanting to keep a complete history of my work, for my own benefit, and not wanting anyone to see how messy and crappy everything is. I’ve been trying to work in one branch then merge only when a task is “complete”. But it’s a bit confusing for me especially if I leave a project for a while then come back to it. Especially especially if submodules are involved. Is there some sort of convention about how to do this? Or am I thinking about it wrong?