Git Merge after deploy

Is there any way in Octopus for me to perform a git merge to master after a deployment is successful?

Our workflow involves a deployment from a release branch. Afterwards, we want to merge the release branch to master to ensure master always contains the source code that is currently in production.

Is there anyway to perform this easily (hopefully via plugin?) in Octopus?

Hi Peter,

Thanks for getting in touch! There is nothing in Octopus that would do that out of the box but you could write a custom script that performs the merge.

If you need a sample step template that interacts with git command line then you can have a look at one of our community contributed step templates.

Please, let me know if that doesn’t solve your problem.