Fix LFS auto-push failure because out of date, via auto-pull #136
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There's a common problem if you use the LFS locking mode with more than one person. Because Submit automatically pushes so that it can unlock, if that push fails you're left in a state where you need to resolve it yourself. This means:
This is awkward when most of the time the changes are unrelated, git just won't let you push. And since Unlock isn't exposed in UE4 you either have to do it manually, or know that Revert will do it (even though you haven't got any local changes).
In 99% of cases where locking is applied, you could just auto-pull to resolve then try again. So that's what this PR does. In the case of a failed pull, this change:
This is a big QoL improvement for us, hope you like it.