Making a commit to branch X (not main/master), after branch X remote was merged into main/master, results in the next commit not containing some files

[TylerHanavan]

This was observed in vRec's tSuite...

dev was merged into main on remote (GH Pull Request), then a change was made in .tsuite/tests/selenium/ShowRecordDefinitionsTest.php, and that was commited to dev.

Then the next test had 27 tests (it excluded ShowRecordDefinitionsTest.php in its testing, although it exists in the testbook.json on the remote?). After Retest, it found 28 tests (included ShowRecordDefinitionsTest.php)

Commit hash fffcd30.

Test results for initial bad one and retest

2025-03-25 01:15:22 | fffcd30 | dev | todo | Tyler Hanavan | Passed | 28 | 0 | 0ms | 0ms | 0ms | Unknown | Retest -- | -- | -- | -- | -- | -- | -- | -- | -- | -- | -- | -- | -- 2025-03-25 01:14:04 | fffcd30 | dev | todo | Tyler Hanavan | Passed | 27 | 0 | 0ms | 0ms | 0ms | Unknown | Retest 2025-03-25 01:15:22 [fffcd30](http://tsuite02/repo/vRec/commit/fffcd3041a69113fb75f2bc7549ae10d70991f0f) dev todo Tyler Hanavan Passed 28 0 0ms 0ms 0ms Unknown Retest

2025-03-25 01:14:04 fffcd30 dev todo Tyler Hanavan Passed 27 0 0ms 0ms 0ms Unknown
Retest

git command output for initial bad one
[vRec/dev fffcd30] new commit, proceeding to git pull
HEAD is now at 455fc24 check modal close button data-dismiss
Your branch and 'origin/dev' have diverged,
and have 4 and 99 different commits each, respectively.
(use "git pull" if you want to integrate the remote branch with yours)
From https://github.com/TylerHanavan/vRec

• branch dev -> FETCH_HEAD
  455fc24..fffcd30 dev -> origin/dev
  hint: You have divergent branches and need to specify how to reconcile them.
  hint: You can do so by running one of the following commands sometime before
  hint: your next pull:
  hint:
  hint: git config pull.rebase false # merge
  hint: git config pull.rebase true # rebase
  hint: git config pull.ff only # fast-forward only
  hint:
  hint: You can replace "git config" with "git config --global" to set a default
  hint: preference for all repositories. You can also pass --rebase, --no-rebase,
  hint: or --ff-only on the command line to override the configured default per
  hint: invocation.
  fatal: Need to specify how to reconcile divergent branches.

Executing stage: Build vRec with Composer
Executing shell action
Executing stage: Install vRec

git command output for Retest that worked
[vRec/dev fffcd30] new commit, proceeding to git pull
HEAD is now at fffcd30 todo
Your branch is up to date with 'origin/dev'.
From https://github.com/TylerHanavan/vRec

• branch dev -> FETCH_HEAD
  Already up to date.

Executing stage: Build vRec with Composer
Executing shell action
Executing stage: Install vRec
Executing shell action