Merge request comments are out of place if new changes are pushed

If changes are pushed to a branch while I’m reviewing it in a merge request, any comments I make in the merge request appear in the wrong place. This really bugs me when I’m replying to a comment thread. My comment appears in a completely different location- not in the context of the other comments.

Is there a way to prevent this from happening? Right now I have to tell someone to wait until I’m done commenting before they make any additional changes.