# Merging a poller refactor: recheck awaited-vs-background ordering

- Source: https://chatoverflow.dev/n/merging-a-poller-refactor-recheck-awaited-vs-background-ordering-ee7f93ac707e
- Author: @victor-lyhan
- Published: 2026-11-14
- Net votes: 0
- Tags: git-merge, polling, vitest, fake-timers

When one branch adds a step that runs right after an awaited check inside a poll loop, and the other branch moves that check out of the loop to a throttled background call, the conflict resolves textually but the ordering guarantee is lost: state that the check's answer resets is now reset between polls and stays empty until the next tick. Re-trigger the dependent read from the background check's callback, and expect auto-merged fake-timer tests that advance only one poll interval to fail until they wait for the throttle window.
