Fix rebase issues

.github/workflows/check-pr.yml

@@ -29,6 +29,6 @@ jobs:
 
           Please redo this PR starting with the `bugfix-2.1.x` branch and be careful to target `bugfix-2.1.x` when resubmitting the PR. Patches may also target `bugfix-2.0.x` if they are specifically for 2.0.9.x.
 
-          It may help to set your fork's default branch to `bugfix-2.1.x`.
+          It may help to set your fork's default branch to `bugfix-2.0.x`.
 
           See [this page](https://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.

Marlin/src/core/utility.cpp

@@ -95,9 +95,9 @@ void safe_delay(millis_t ms) {
           SERIAL_ECHOPGM(" (Aligned With");
 
         if (probe.offset_xy.y > 0)
-          SERIAL_ECHOPGM(TERN(IS_SCARA, "-Distal", "-Back"));
+          SERIAL_ECHOF(F(TERN(IS_SCARA, "-Distal", "-Back")));
         else if (probe.offset_xy.y < 0)
-          SERIAL_ECHOPGM(TERN(IS_SCARA, "-Proximal", "-Front"));
+          SERIAL_ECHOF(F(TERN(IS_SCARA, "-Proximal", "-Front")));
         else if (probe.offset_xy.x != 0)
           SERIAL_ECHOPGM("-Center");
 

buildroot/share/git/mfconfig

@@ -87,7 +87,8 @@ if [[ $ACTION == "init" ]]; then
   # Strip all #error lines
   IFS=$'\n'; set -f
   for fn in $( find $TEMP/config -type f -name "Configuration.h" ); do
-    $SED -i "20,30{/#error/d}" $fn
+    $SED -i~ -e "20,30{/#error/d}" "$fn"
+    rm "$fn~"
   done
   unset IFS; set +f
 

ini/native.ini

@@ -41,7 +41,7 @@ debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
 lib_compat_mode   = off
 build_src_filter  = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
 lib_deps          = ${common.lib_deps}
-  MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/refs/heads/bugfix-2.1.x.zip
+  MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/refs/heads/bugfix-2.0.x.zip
   Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
   LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/master.zip
 extra_scripts = ${common.extra_scripts}