rename Reloop Beatmix MK2 controller files to denote they are for the MK2

[mxmilkiib]

off the back of discussion on #12422

if the MK1 files get called that, the current MK2 filenames will be too ambiguous

[ronso0]

I have no objections. Why is it still a draft?
The only downside of this optimization is that users who have the old mapping loaded will be surprised, once after updating. Which is acceptable IMHO

[ronso0]

May I ask why you keep rebasing small branches like this that have no conflicts with the target branch?

[mxmilkiib]

I updating each feature branch to the latest main so I can be sure nothing conflicts, esp. when it comes to merging multiple branches

[ronso0]

Because I do not want to do this, and because my pending feature branches may have conflicts with each other, I use a helper which basically cherry-picks all commits of branch xyz into my production branch. Then I resolve conflicts individually (git rerere helps avoiding repetetive manual resolutions btw).
In short it's git cherry-pick $(git merge-base [base branch] [branch])..[branch]
And here's the definition from my git.plugin.sh for zsh/OhMyZsh:

# cherry-pick all commits of branch $1 (opt: relative to branch $2)
# usage: gcpb branch-name [optional: base branch]
function gcpb() {
  if [[ "$#" == 0 ]]; then
    return
  fi

  local branch=$1
  local base="mixxx/main"
  if [[ "$#" == 2 ]]; then
    base="mixxx/"$2
  fi
  git cherry-pick $(git merge-base $base $branch)..$branch
}
compdef _git gcpb=git-checkout

[ronso0]

Thank you, LGTM

[ronso0]

Oh, we could as well have merged this to 2.6, or even 2.5 in case there'll be another bugfix release before 2.6