What is a back-merge

Question

I’ve watched some videos on the git-flow scripts and one term that comes up is “back merge” - e.g. hotfix is merged into master and back merged into develop.

I’m assumin

Answer 1

It's just two ordinary merge commands:

git checkout master
git merge hotfix
git checkout develop
git merge hotfix

You can think of the "normal" flow of commits being from your development branch to master as the work is completed. In a back-merge, the commits are flowing in the opposite direction, from hotfix into your development branch.