Problem in Git Roll Back Pushed to GitHub Jun 9 19:49:48 2026 +0300

[ForrestErickson]

Summary

Rolling back to a previous git commit and then pushing to main on GitHub caused Merge message in commit.
Date: Tue Jun 9 19:49:48 2026 +0300

Some Details of Problem

Example text of Merged Result

++<<<<<<< HEAD

• if (ENABLE_KRAKE_TEST_ALARMS) {

• unsigned long ms = millis();

• if (ms > krake_last_published + KRAKE_SEND_MS) {

•  publishTestToKrake();
  

•  krake_last_published = ms;
  

•  //delay(4000);
  

• }

• }
  ++=======

• // {

• // unsigned long ms = millis();

• // if (ms > krake_last_published + KRAKE_SEND_MS) {

• // publishTestToKrake();

• // krake_last_published = ms;

• // //delay(4000);

• // }

• // }
  ++>>>>>>> a1d4617a226850b97427e1b2520e5b4969612b51

  networkServiceLoop();
  }

Other information Lee's Local

Admin@Melies MINGW64 /c/Users/Public/Downloads/Arduino/PubInv/ventmon-ventilator-inline-test-monitor/VentMonFirmware_PIO_MQTT (SpikeKrakeAlarmMQTT)
$ git status
On branch SpikeKrakeAlarmMQTT
Your branch and 'origin/SpikeKrakeAlarmMQTT' have diverged,
and have 5 and 2 different commits each, respectively.
(use "git pull" if you want to integrate the remote branch with yours)

nothing to commit, working tree clean

Detils of the Commit / Push which May Be Problem

$ git log
commit 673a3df86ae5ba0c7e1a14158094774fea8c3fc1 (HEAD -> SpikeKrakeAlarmMQTT)
Merge: 755cd2d c73021d
Author: nagham.kheir25 naghamkheir25@gmail.com
Date: Tue Jun 9 19:49:48 2026 +0300

Merge pull request #84 from PubInv/codex/identify-useful-alarm-parameter-19gkpb

Publish compact `a3` over-pressure alarm and simplify MQTT alarm behavior

commit c73021de6ce7780c8880c51865a3d7378508e98b (origin/codex/identify-useful-alarm-parameter-19gkpb)
Merge: 8ae385d 755cd2d
Author: nagham.kheir25 naghamkheir25@gmail.com
Date: Tue Jun 9 19:49:30 2026 +0300

Merge branch 'SpikeKrakeAlarmMQTT' into codex/identify-useful-alarm-parameter-19gkpb

[ForrestErickson]

@RobertLRead

Can you review what was done and help understand how this problem came to be.
I can remember another time a bad problem came when we tried to roll back (not sure this is the correct GIT term) to a previous commit and abandon some changes. So I think there is a methodological change we need to make when trying to turn back time.

Lee

CC: @nk25719