How to merge one current branch into several following branches at the same time?

Question

Edit: The question does NOT merge multiple branches into the current branch. Something that has already been answered a couple of times on Stackoverflow.

I am trying to find the best way to save a tutorial for a great, but still changing technology ( Trailblazer ).

Following the amazing Trailblazer book , I would like to offer the TRB community the easiest follow-up repo.

This is the Git-branch structure I have created so far:

master
  |
  + setup
    |
    + chapter-03-01
      |
      + chapter-03-02
        |
        + chapter-03-03

So my question is: is it possible to make changes to setupand merge it with all subsequent branches at once, as well as make changes, for example, in chapter 03-01, and at the same time merge them into consecutive branches?

Answer 1

,

git merge <b1> <b2> <b3>...

, :
https://developer.atlassian.com/blog/2015/01/git-merge-distinct-octopus-merge/

- ,

---

Git merge -s.

, ( ).

, . . .

: git merge b1 b2 ... bn, is octopus.

, .

, , . .

, , . , , , , .

Answer 2

100%, , , , "Octopus Merge"

git :

Octopus

" , , . , , . .