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?
Published at
2024-09-14 14:48:23Event JSON
{
"id": "891c34bd7ea30f4c71be412125f488722f2abbc4bf97de5a3909934d8d03ba67",
"pubkey": "036533caa872376946d4e4fdea4c1a0441eda38ca2d9d9417bb36006cbaabf58",
"created_at": 1726325303,
"kind": 1,
"tags": [],
"content": "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\n\ngit switch master\ngit merge --squash develop\ngit commit\ngit switch develop\ngit merge master\n\nMy 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? ",
"sig": "510ed2230ee2d1a9d4ccf028bb3290406dc861dac9c702c1e6af1b075fce6e9673633d00b36b10a357ce36bed6154b1f9ec4271ba1688e5604849a3474dba4a8"
}