Backmerge strategy to multiple targets

[syphernl]

Hi @kilianpaquier

One of our devs has raised a question about our backmerge strategy and I am wondering whether this plugin can handle that in the current state.

We have 3 protected branches:

• develop
• acceptance
• production

The current work process:

• Fixes/features get branched from develop, worked on and merged (with squash merge) to the develop branch
• Once ready for acceptance, develop gets merged in acceptance without squash merge (you do not want to lose individual features/fixes)
• Once ready for production, acceptance gets merged into production. Again, no squash merge.
• Sometimes they make hotfixes on the acceptance or production branch. They get squash-merged.

The plugin is currently configured this way:

        targets: [
          { from: "production", to: "develop" },
          { from: "acceptance", to: "develop" }
        ],

In the current state, only production gets merged back to develop but we also want to merge it into acceptance.
If we add { from: "production", to: "acceptance" }, to the targets would this result in:

• production => acceptance
• production => develop

or in

• production => acceptance => develop

[kilianpaquier]

Hello,

Thank you for this question !

It would result in the first hypothesis you gave:

• production => acceptance
• production => develop