pre-create waterfall branches in bump version action

[lavigne958]

By creating the waterfall branches in bump version we ensure when opening the PR that bert-e is already happy and we don't need to solve conflict ourselves knowing that we don't want to keep the upade as the update only contains the version bump for version x.y and we try to merge in upper version branches wo th version is already x+1.y+1 and we don't want to forward-port this change.

[lavigne958]

BTW: this action is only used by xcore projects for now.
If it works we plan to use the same script in artesca, but we won't be using this action we'll be using the action as it's for now custom to xcore only. we'll be just copying the script most probably

[nootal]

@lavigne958 interesting; I understand your PR as:

• we don't leave to bert-e the responsibility to create integration branches, as it would create them the "dumb" way aka merging with upper branches, that would create conflicts in this case, and we would have to revert/ignore the changes
• instead, we pre-create the integration branches with a script that will automatically resolve the conflicts with a specific strategy so we don't merge forward the bump and we keep what already exists in the upper branches
• when the PR is eventually created, bert-e is happy from the start as all branches are here and it can directly use them
  Am I correct with this understanding?

If yes, I'm OK with you moving forward with this approach as it helps you in the short term, but we could do better for the greater good: we could add an option to bert-e to solve conflicts with a specific strategy, as you did; would look like a command /solve_conflicts_strategy_ours then bert-e would work as usual and solve them the way you want.
This would avoid your script replicating the internals of bert-e.

[lavigne958]

Hi yes this is exactly what it is 🤩

hoooo my god this is so cool ! that would help us so much on each artesca release you have no idea.

So far as I said this is only used in xcore internal repo so that's safe to use I think.

but yes the bert-e approach would be awesome ! on behalf of all personal workinf on artesca CI: thank you so much

[tcarmet]

Leaving a comment that is optional to address, therefore approving.