That was strange, some warning/fault saying some thing about non linear PR which had a red mark and required that I merge it down below. There were choices to merge, squash etc. That's all very interesting, but perhaps that happens when I've made some other commits beyond what you have in your repo. It was easy enough to override and it shows up in the local repos history after a pull as:
C:\Users\fcgle\source\watchdog_pi>git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 8 different commits each, respectively.
(use "git pull" if you want to integrate the remote branch with yours)
So I had to pull again.
C:\Users\fcgle\source\watchdog_pi>git pull origin master
Enter passphrase for key '/c/Users/fcgle/.ssh/id_ed25519':
From github.com:rgleason/watchdog_pi
branch master -> FETCH_HEAD
Merge made by the 'ort' strategy.
include/WatchdogDialog.h | 1 +
src/Alarm.cpp | 17 ++++++++++++-----
src/WatchdogDialog.cpp | 22 +++++++++++++++++++---
3 files changed, 32 insertions(+), 8 deletions(-)
That was strange, some warning/fault saying some thing about non linear PR which had a red mark and required that I merge it down below. There were choices to merge, squash etc. That's all very interesting, but perhaps that happens when I've made some other commits beyond what you have in your repo. It was easy enough to override and it shows up in the local repos history after a pull as:
C:\Users\fcgle\source\watchdog_pi>git pull origin master:master Enter passphrase for key '/c/Users/fcgle/.ssh/id_ed25519': remote: Enumerating objects: 26, done. remote: Counting objects: 100% (26/26), done. remote: Compressing objects: 100% (10/10), done. remote: Total 26 (delta 16), reused 22 (delta 16), pack-reused 0 Unpacking objects: 100% (26/26), 6.34 KiB | 92.00 KiB/s, done. From github.com:rgleason/watchdog_pi ! [rejected] master -> master (non-fast-forward) d507dea..f64331a master -> origin/master
C:\Users\fcgle\source\watchdog_pi>git status On branch master Your branch and 'origin/master' have diverged, and have 1 and 8 different commits each, respectively. (use "git pull" if you want to integrate the remote branch with yours)
So I had to pull again.
C:\Users\fcgle\source\watchdog_pi>git pull origin master Enter passphrase for key '/c/Users/fcgle/.ssh/id_ed25519': From github.com:rgleason/watchdog_pi