R
R
rm root2020-06-07 11:15:37
git
rm root, 2020-06-07 11:15:37

I created a branch, moved to it, forgetting that I was not in the main branch, making changes to files, and how to go to the main branch to commit the changes?

how to solve this without merging branches
when trying to move to the main branch, it gives this

(venv) PS C:\Users\reabk\Desktop\aaa\cinemax-django> git checkout master
error: Your local changes to the following files would be overwritten by checkout:
        cinemax_project1/__pycache__/settings.cpython-36.pyc
        cinemax_project1/__pycache__/urls.cpython-36.pyc
        db.sqlite3
        userpage/__pycache__/__init__.cpython-36.pyc
        userpage/__pycache__/admin.cpython-36.pyc
        userpage/__pycache__/models.cpython-36.pyc
        userpage/__pycache__/urls.cpython-36.pyc
        userpage/__pycache__/views.cpython-36.pyc
        userpage/migrations/__pycache__/__init__.cpython-36.pyc
Please commit your changes or stash them before you switch branches.
Aborting

Answer the question

In order to leave comments, you need to log in

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question