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

Backmerge is nothing but add your hotfix changes into your current working branch.

Let's say you have two branches Develop and Master
You found any major bug on Master. You fixed it on Master branch itself as a hotfix. Later you need to add your bugfix change into your current working branch i.e Develop branch. so you need to do back-merge like this

---

1. git checkout Develop
2. git merge Master
3. git push origin Develop