.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. What does ‘–set-upstream’ do?
  34. What does ‘–set-upstream’ do?
  35. How to use Git Revert
  36. How do I properly force a Git push?
  37. How to remove local (untracked) files from the current Git working tree
  38. Git submodule update
  39. What does ‘git merge –abort is equivalent to git reset –merge when MERGE_HEAD is present.’ of Git merge man page mean?
  40. How to modify existing, unpushed commit messages?
  41. Git pushing to remote branch
  42. How to revert a merge commit that’s already pushed to remote branch?
  43. GitHub Error Message – Permission denied (publickey)
  44. How do I push a new local branch to a remote Git repository and track it too?
  45. How do you push a tag to a remote repository using Git?
  46. How to solve SSL certificate: self signed certificate when cloning repo from github?
  47. How do I revert a Git repository to a previous commit?
  48. How do I resolve git saying “Commit your changes or stash them before you can merge”?
  49. How to revert multiple git commits?
  50. How do I rename both a Git local and remote branch name?
  51. How do I fix a Git detached head?
  52. How to cherry-pick multiple commits
  53. Undo git pull, how to bring repos to old state
  54. Another git process seems to be running in this repository
  55. rejected master -> master (non-fast-forward)
  56. merge one local branch into another local branch
  57. How to get the current branch name in Git?
  58. Can I share my private GitHub repository by link?
  59. How to rename a directory/folder on GitHub website?
  60. Create a git patch from the uncommitted changes in the current working directory
  61. git push says “everything up-to-date” even though I have local changes
  62. Download a single folder or directory from a GitHub repo
  63. Is there a “git touch” so I can push the same file with a new timestamp?
  64. Branch from a previous commit using Git
  65. Throw away local commits in Git
  66. Hard reset of a single file
  67. Hard reset of a single file
  68. How to remove remote origin from a Git repository
  69. Not a valid object name: ‘master’
  70. git add remote branch
  71. Undo a git stash
  72. Undo git stash pop that results in merge conflict
  73. Git: cannot checkout branch – error: pathspec ‘…’ did not match any file(s) known to git
  74. Set up git to pull and push all branches
  75. Invalid VCS root mapping – 3 errors on my project
  76. Unity Collaborate vs GitHub
  77. SourceTree keeps asking for Github password
  78. Git’s local repository and remote repository — confusing concepts
  79. How to change the license for a project at Github?
  80. Git add all files modified, deleted, and untracked?
  81. How to switch back to ‘master’ with git?
  82. Github Authentication Failed – … GitHub does not provide shell access
  83. How do I pull files from remote without overwriting local files?
  84. How can I see which Git branches are tracking which remote / upstream branch?
  85. Your repository has no remotes configured to push to
  86. Uninitialize git repository
  87. Specify an SSH key for git push for a given domain
  88. How do I “un-revert” a reverted Git commit?
  89. How to create a local branch from an existing remote branch?
  90. git push not send changes to remote git repository
  91. How to merge a specific commit in Git
  92. What is the .git folder?
  93. How to use Git and Dropbox together?
  94. Git: Where exactly is the “working directory”?
  95. What exactly does the “u” do? “git push -u origin master” vs “git push origin master”
  96. What is the usual process of saving changes made at the CMS level into source control?
  97. Add latest commit info on login footer using login_footer hook
  98. WordPress Core files not being ignored by Git
  99. Display GitLab repositories of the logged in user on a page
  100. How to retrieve the last modification date of all files in a Git repository

Leave a Comment

tech