In this kind of predicament, you'd probably want to 1st revert the past revert, which might make the history look like this:This makes it essential which the lock is produced through the holding thread when it is actually finished with it. If it by no means releases it, then the opposite thread will wait indefinitely.By changing I mean merging bran