w3hello.com logo
Home PHP C# C++ Android Java Javascript Python IOS SQL HTML videos Categories
A locally ignored file was updated on remote; can't checkout to remote branch now

I've currently made it work by indexing the ignored file once more. I used the command:

git update-index --no-assume-unchanged

and then the checkout command executed easily and properly. I'll leave this as an answer here. If someone can answer the following question, I'd be grateful:

Is there some way to checkout the remote branch and then either force ignoring the file files/dependency/config.lua whenever someone pulls in my changes or something similar?

© Copyright 2018 w3hello.com Publishing Limited. All rights reserved.