We currently put all changes to the develop branch, merge the changes we want into main, create a tag on main, and then merge that back into develop. Since we are making use of squash-commits, each commit to develop is a discrete feature, and ALL commits are approved by at least one person, I'd propose that we just create tags off of develop. This way we could make our process one step as oppose to four highly redundant steps.
What issue are you seeing?
We currently put all changes to the
developbranch, merge the changes we want intomain, create a tag onmain, and then merge that back intodevelop. Since we are making use of squash-commits, each commit todevelopis a discrete feature, and ALL commits are approved by at least one person, I'd propose that we just create tags off ofdevelop. This way we could make our process one step as oppose to four highly redundant steps.