• Register
0 votes
122 views

Problem :

I added the folder to the .gitignore file.

Once I do the git status it tells me

# On branch latest
nothing to commit (working directory clean)

But when I try to change my branches I get the below:

My-MacBook-Pro:webapp marcamillion$ git checkout develop
error: The following untracked working tree files would be overwritten by checkout:
    public/system/images/9/thumb/red-stripe.jpg
    public/system/images/9/original/red-stripe.jpg
    public/system/images/8/thumb/red-stripe-red.jpg
.
.
Please move or remove them before you can switch branches.
Aborting

This is how the .gitignore file looks like:

.bundle
.DS_Store
db/*.sqlite3
log/*.log
tmp/**/*
public/system/images/*
public/system/avatars/*

How do I get this working for me so I can switch my branches without deleting those files?

7 5 2
3,870 points

1 Answer

0 votes

Solution :

It appears like you want your files ignored but they are already committed. The .gitignore has no effect on your files that are already in your repo so they must be removed with git rm --cached. A --cached will prevent it from having any effect on the working copy and it will just mark it as removed the next time you commit. After your files are removed from a repo then your .gitignore will prevent them from being added again.

But you have another problem also with your .gitignore, you must be excessively using wildcards and that is causing it to match less than the expect it to. Instead of that lets change your .gitignore and try as given below.

.bundle
.DS_Store
db/*.sqlite3
log/*.log
tmp/
public/system/images/
public/system/avatars/
9 7 4
38,600 points

Related questions

0 votes
2 answers 2.1K views
2.1K views
Problem : On the branch I had some files in the .gitignore On the different branch those files are not. I am trying to merge the different branch into my branch, and I don't bother if those files are no longer overlooked or not. Unfortunately I get below ... by merge” How should I modify the pull command to overwrite those files, without needing to find, move or delete those files by myself?
asked Jan 6 alecxe 7.5k points
1 vote
2 answers 880 views
880 views
Problem : On the branch which I had some of my files in .gitignore On the different branch those files are not present. So I want to merge the different branch into my branch and I really do not care about those files if they are no longer ignored or not. But ... by merge How can I modify the pull command to overwrite the files, without me needing to find, move or delete the files by myself?
asked Dec 27, 2019 alecxe 7.5k points
0 votes
2 answers 91 views
91 views
Problem : I have the project with two branches as staging and beta. I try to develop on staging, and use my master branch to fix the bugs. git checkout master And do the stuff on it : git add fileToAdd git commit -m "bug fixed ... be overwritten by checkout: src/Pro/ConvocationBundle/Controller/DefaultController.php Please, commit your changes or stash them before you can switch branches. Aborting
asked Dec 18, 2019 alecxe 7.5k points
0 votes
1 answer 116 views
116 views
Problem : How can I ignore the below error message on the Git pull? Your local changes to the following files would be overwritten by merge What if I just want to overwrite them? I Have already tried many things like git pull -f, but nothing really works for me.To be very clear, I just want to overwrite the specific changes and not the everything.
asked Jan 2 alecxe 7.5k points