[v1] Advertise slack channel

[github-actions]

This is an automated backport of #2684

We have a shiny new #gophercloud channel on kubernetes slack. Let's advertise it.

[mandre]

This is not a clean backport, we don't want this in v1.

[pierreprinetti]

@mandre You seem to have identified an issue with conflict resolution in the backporting tool. Can you please explain what you have found?

CC @lampajr

[mandre]

@mandre You seem to have identified an issue with conflict resolution in the backporting tool. Can you please explain what you have found?

I haven't looked too deep into it, but you can see that this proposed backport contains a line that was not in the original commit, and removed two other lines.

Original PR: https://github.com/gophercloud/gophercloud/pull/2684/files
Proposed backport: https://github.com/gophercloud/gophercloud/pull/2685/files

I would expect that in case of conflicts, like here, the tool fails to apply the cherry-pick and report an error so that we can manually backport.

[lampajr]

@mandre I just checked and this is due to the fact that right now all cherry-picks are performed using default theirs strategy-option [1] to automatically resolve conflicts.

I just tried to remove that option locally (i.e., without theirs option) and run the tool from CLI and this is the error:

[ERROR] Error: Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
error: could not apply 44eb3a19... Advertise slack channel
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

which is what you were expecting right?

Anyway I think that I could change the default strategy-option to the git default one and let users override it with the one they prefer, wdyt?

If you agree do you mind to open an issue with your example?

[1] https://github.com/kiegroup/git-backporting#how-it-works

[mandre]

I'm going to re-add the backport-v1 label, just to check that it fails applying the cherry-pick due to conflict, as we expect. Please ignore.

[mandre]

Ah, wrong PR. Please double-ignore.

[pierreprinetti]

Did it create a PR? I didn’t exclude “v1” from the potential backport sources.