.gitignore and “The following untracked working tree files would be overwritten by checkout”

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

But you have another problem with your .gitignore, you are excessively using wildcards and its causing it to match less than you expect it to. Instead lets change the .gitignore and try this.

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

Related Posts:

  1. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  2. What is the best (and safest) way to merge a Git branch into master?
  3. Undo a Git merge that hasn’t been pushed yet
  4. Git merge hotfix branch into feature branch
  5. Abort a Git Merge
  6. How to resolve merge conflicts in a Git repository
  7. Ignoring directories in Git repositories on Windows
  8. Gitignore not working
  9. How can I merge multiple commits onto another branch as a single squashed commit?
  10. Gitignore not working
  11. How can I merge multiple commits onto another branch as a single squashed commit?
  12. The following untracked working tree files would be overwritten by merge, but I don’t care
  13. The following untracked working tree files would be overwritten by merge, but I don’t care
  14. Git error on commit after merge – fatal: cannot do a partial commit during a merge
  15. Is there a “theirs” version of “git merge -s ours”?
  16. How can I make Git “forget” about a file that was tracked, but is now in .gitignore?
  17. What are the differences between .gitignore and .gitkeep?
  18. How to create a .gitignore file
  19. The following untracked working tree files would be overwritten by merge, but I don’t care
  20. Is there a “theirs” version of “git merge -s ours”?
  21. git: How to ignore all present untracked files?
  22. What to gitignore from the .idea folder?git intellij-idea gitignore webstorm
  23. Is it possible to pull just one file in Git?
  24. How to resolve git status “Unmerged paths:”?
  25. How to keep a branch synchronized/updated with master?
  26. Resolve Git merge conflicts in favor of their changes during a pull
  27. Found a swap file by the name
  28. Is there a git-merge –dry-run option?
  29. Git pull – Please move or remove them before you can merge
  30. Why is .gitignore not ignoring my files?
  31. Sourcetree adding files in global .gitignore, not in repository .gitignore
  32. How do I check out a remote Git branch?
  33. How do I delete a Git branch locally and remotely?
  34. How do I use ‘git reset –hard HEAD’ to revert to a previous commit? [duplicate]
  35. What is git tag, How to create tags & How to checkout git remote tag(s)
  36. How do I delete a Git branch locally and remotely?
  37. How do I rename a local Git branch?
  38. What does ‘–set-upstream’ do?
  39. What does ‘–set-upstream’ do?
  40. Difference between “git add -A” and “git add .”
  41. Git: Message ‘src refspec master does not match any’ when pushing commits in Git
  42. Git: Message ‘src refspec master does not match any’ when pushing commits in Git
  43. error: src refspec master does not match any
  44. What does cherry-picking a commit with Git mean?
  45. How to cherry pick from 1 branch to another
  46. How to Git stash pop specific stash in 1.8.3?
  47. How to use Git Revert
  48. How do I undo the most recent local commits in Git?
  49. How do I revert a Git repository to a previous commit?
  50. How to merge branch to master?
  51. How do I force git pull to overwrite everything on every pull?
  52. What happens when I do git pull origin master in the develop branch?
  53. How do I properly force a Git push?
  54. fatal: Not a git repository (or any of the parent directories): .git [duplicate]
  55. How can I switch to another branch in git?
  56. How to remove local (untracked) files from the current Git working tree
  57. Squash my last X commits together using Git
  58. Git refusing to merge unrelated histories on rebase
  59. Git submodule update
  60. How to apply a patch generated with git format-patch?
  61. What is the `git restore` command and what is the difference between `git restore` and `git reset`?
  62. What does ‘git merge –abort is equivalent to git reset –merge when MERGE_HEAD is present.’ of Git merge man page mean?
  63. What does ‘git blame’ do?
  64. What is the difference between git push origin and git push origin master
  65. GitHub: Permission denied (publickey). fatal: Could not read from remote repository
  66. Git fetch remote branch
  67. How to delete a remote tag?
  68. Updates were rejected because the tip of your current branch is behind its remote counterpart
  69. Updates were rejected because the tip of your current branch is behind its remote counterpart
  70. git stash apply version
  71. How to modify existing, unpushed commit messages?
  72. How do I clone a specific Git branch? [duplicate]
  73. Git pushing to remote branch
  74. How to revert a merge commit that’s already pushed to remote branch?
  75. What is Git pruning?
  76. Git pushing to remote branch
  77. git – remote add origin vs remote set-url origin
  78. How do I undo ‘git add’ before commit?
  79. Git: Message ‘src refspec master does not match any’ when pushing commits in Git
  80. GitHub Error Message – Permission denied (publickey)
  81. Git fetch remote branch
  82. How can I see the differences between two branches?
  83. How to upgrade Git on Windows to the latest version
  84. Reset local repository branch to be just like remote repository HEAD
  85. How do I push a new local branch to a remote Git repository and track it too?
  86. Practical uses of git reset –soft?
  87. Need to reset git branch to origin version
  88. How do I push a new local branch to a remote Git repository and track it too?
  89. Updating a local repository with changes from a GitHub repository
  90. How do I remove a submodule?
  91. LF will be replaced by CRLF in git – What is that and is it important? [duplicate]
  92. git: fatal: Could not read from remote repository
  93. Git push results in “Authentication Failed”
  94. What does “Changes not staged for commit” mean
  95. github changes not staged for commit
  96. Git : fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists
  97. Windows git “warning: LF will be replaced by CRLF”, is that warning tail backward?
  98. git: fatal: Could not read from remote repository
  99. Git push results in “Authentication Failed”
  100. What does “Changes not staged for commit” mean

Leave a Comment

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)