What is Nostr?
ChipTuner
npub1qdj…fqm7
2024-09-14 14:48:23

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?
Author Public Key
npub1qdjn8j4gwgmkj3k5un775nq6q3q7mguv5tvajstmkdsqdja2havq03fqm7