Need Branching Strategy Advice
We are struggling to come up with a good branching strategy for our databases. We are using SQL Source Control with Git, Jenkins (for builds) and Octopus (for deployments to Test and Production). Only the master branch is pushed through the Jenkins/Octopus processes.
Suppose we have two pending issues (Issue1 and Issue2) being worked by two different developers. Each developer creates a branch, commits their changes to their respective branches, and performs unit testing. Both decide the changes are ready to be pushed downstream and merge their changes into master. The Jenkins process does a successful build and we use Octopus to push the changes into our Test environment.
Suppose further that for whatever reason, we decide that only Issue1 is ready for production deployment. How do we unwind the Issue2 change? Is there a better way to handle this?