Home/ Questions/Q 6640865
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-25T23:44:39+00:00

Attempting to pull from git repo, but getting the following output. I think these

  • 0

Attempting to pull from git repo, but getting the following output. I think these files are tracked (As they should be), but its indicating that they are not. They are not in .gitignore. I am about 5-10 commits behind the branch. 

git pull --rebase origin master
From github.com:user/Project
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
error: The following untracked working tree files would be overwritten by checkout:
mountdoom/protected/models/UserHelper.php
mountdoom/protected/models/UserRegistrationForm.php
mountdoom/protected/runtime/state.bin
mountdoom/protected/views/site/register.php
Please move or remove them before you can switch branches.
Aborting
could not detach HEAD

Any ideas how to resolve this?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    They’re tracked in the version you’re checking out, but not in the version you had checked out previously. If you don’t care about the untracked versions, just remove them.

    If you do care about them, commit them before doing the rebase. You may then have to merge as part of the rebase process.

    • 0