> which is going on the opposite direction as you would expect.

It looks like a bug which should be fixed. Git should create a merge commit when it sees that "the direction" changes.