Subnostr

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?

Sascha-Oliver Prolić 1y ago

Sorry no, that doesn't make sense. As soon as you squash commits, you have a different hash and the history diverges from here. That holds true, even if the actual file content is the same.

Reply to this note

Please Login to reply.

Discussion

ChipTuner 1y ago

Yeah that explains it thank you. So is there any way to acheive this while also having the squash feature, effectively 2 linear branches?

Sascha-Oliver Prolić 1y ago

Try this instead: git rebase -i origin/master. Pick and squash manually. This way you can squash all "cleanup" commits, rewrite some commit messages and deliver a much cleaner PR to master branch. Giant commits with tons of code are meaningless anyway, since you can't read what happened. Managing a clear and understandable git history takes a lot of discipline.