4 ms·
Yup, squash and merge is THE way to go. I've tasted the good life. I always tie a commit back to a ticket and go to the ticket/issue for context with squash and
by ElijahLynn 4y ago
Yup, squash and merge is THE way to go. I've tasted the good life. I always tie a commit back to a ticket and go to the ticket/issue for context with squash and merge. There is so much rich discussion in it that commit messages don't compare.
This approach when merging in the GH UI, puts the ticket number in the merged commit (not a merge commit though). And the biggest advantage of this approach is there is NEVER a "revert the revert" situation when dealing with reverting. So easy and clean to revert because you aren't reverting a merge commit.
I get that "we can't change issue tracking software" but that is just something you gotta live with, and the advantages of squash and merge far outweigh this "possibility".