ChipTuner on Nostr: I have a git question. I like using a development branch that tracks all commits ...
I have a git question. I like using a development branch that tracks all commits individually, then I squash merge into master, then tags and CI and all happen on master. So this is basically the flow
git switch master
git merge --squash develop
git commit
git switch develop
git merge master
My issue is that the compare history does not collapse after merging master into develop. I don't want to lose the history of develop but I want git to ignore the branch history before the merge if that makes sense?
git switch master
git merge --squash develop
git commit
git switch develop
git merge master
My issue is that the compare history does not collapse after merging master into develop. I don't want to lose the history of develop but I want git to ignore the branch history before the merge if that makes sense?