GIT Trunk based strategy for merging ticket/branches

So as a tech lead, we ahve to review code before deployment

The challenges are

  • How to have clean merges up to prod (higher environment)?

The solution found was to use GIT SQUASH instead of git merge as it combines all sub commits to only one final commit in the log history

  • How to have clean merges, down to the development branch ?

The solution found, is to use GIT MERGE instead of git squash against the dev environment after successful deployment to PROD

as the git log history stays intact and merging keep records straight

Leave a Reply