Check-In fails due to not latest

[Rowanion]

Hi,

using UE4.21.2 and latest plugin master

I have a branch "develop" where everyone works in. Source and Content lives there. If a coder pushes a source change, an artist's asset Check-In fails because no pull was executed prior to that. But there is already a local commit for that asset.

When the artist does a sync/pull after that, the plugin tries to rebase the whole develop branch onto the master - resulting in a re-copy/download of lots of gigabytes of assets, failing in the end, leaving you with a detached head in the middle of a rebase.

When using file locking, why isn't a pull executed prior to any Check-In? Due to the file locks, none of your modified files can have any changes from somebody else anyway.

Executing the local commit first when doing a Check-In might result in a merge commit, which might not be pushable, because another artist might have locked one or more assets, that are part of that merge commit.

[SRombauts]

Hi @Rowanion, this is actually a very good suggestion! This is not at all how Perforce or Subversion works, but for Git it make a lot of sense.