Help with UE version control using Git, Visual Studio and Azure Devops

I’m trying to use Git for version control using Visual Studio as my Git Client and Azure Devops for my remote repository. It works perfectly when I create a new commit…I make a change in Unreal (let’s say to a blueprint), I go into visual studio, I see the blueprint files that have changes in the Git Changes window, commit them, then Push them to Azure, and everything works great.

However, if I do anything that changes an existing commit, for example amending, squashing, etc., as soon as I initiate the command locally, it all of a sudden has an update to pull from Azure, even though I’ve done nothing in Azure and haven’t pushed anything to Azure. This update prevents me from pushing. In some cases, I can pull and then push, which works but changes the commit message to something strange (e.g. Merge branch ‘main’ of https://… into main).

Has anyone encountered this issue before? Any ideas? Should I not be using Visual Studio as my Git Client? Worst case I can stick to new commits, but this is an annoying bug.