cannot rebase if a new file is created which is not present in .gitignore in the base branch

[ankurrajdev]

Please provide information about your setup
DVC version(i.e. dvc --version), Platform and method of installation (pip, homebrew, pkg Mac, exe (Windows), DEB(Linux), RPM(Linux))

Note: checking out '171d6c61b9a643be0d2d998f2d3b644c33bc4e4c'.
I created some new files namely cavchon.parquet and cavachon_result.csv.
I am getting the following error when I am trying to rebase it to the base branch.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

git checkout -b

HEAD is now at 171d6c6 ENH: add the device modifier based on adgroup type and device typ
WARNING: Cache 'd273ac33145468f344dd2a08b5dae827' not found. File 'data/cavachon_result.
WARNING: data 'data/beagle_predictions.parquet' exists. Removing before checkout.
WARNING: Cache '78e5b1b8677dec94d2f2f64b5c7b649f' not found. File 'data/cavachon.parquet
WARNING: data 'data/beagle.parquet' exists. Removing before checkout.
WARNING: data 'models/beagle.joblib' exists. Removing before checkout.
WARNING: data 'data/beagle_train.parquet' exists. Removing before checkout.
WARNING: data 'data/beagle_test.parquet' exists. Removing before checkout.
ERROR: unexpected error - Checkout failed for following targets:
data/cavachon_result.csv
data/cavachon.parquet
Did you forget to fetch?

Having any troubles? Hit us up at https://dvc.org/support, we are always happy to help!
could not detach HEAD

[efiop]

Hi @ankurrajdev !

Could you provide dvc version output, please?

Do you have our git hooks installed?

[ankurrajdev]

Hi @ankurrajdev !

Could you provide dvc version output, please?

Do you have our git hooks installed?

dvc version is 0.80.0.

Yes I have installed the git hooks.

I'm not able to understand the problem 🙈

@efiop , @ankurrajdev , could you provide a reproduction script for it?

[efiop]

@MrOutis When rebasing git runs git checkout, which triggers dvc checkout, which is not able to checkout and looks like that is interrupting the rebase. Need to take a closer look.

[efiop]

@ankurrajdev For now a workaround would be to disable (remove) .git/hooks/post-checkout.py , it would prevent dvc checkout from being run automatically after git checkout, but you could still run dvc checkout by-hand.

[ankurrajdev]

@ankurrajdev For now a workaround would be to disable (remove) .git/hooks/post-checkout.py , it would prevent dvc checkout from being run automatically after git checkout, but you could still run dvc checkout by-hand.

Got it thanks. I copied everything again and created a new branch and it's working right now. If it happens again, I'll let you know.

Thanks for the support.

@efiop , I think git rebase with --no-verify option should also work.