@TonyBologni Yes, force-with-lease will
reduce the times this might happen.

However, I recommend to use only personal branches.

Integration of work should happen in the main branch:
https://trunkbaseddevelopment.com/