I accidentally committed files that should be in gitignore, and when I pulled the commit my files were overwritten by the ones from the commit.
I reverted the commit to the previous one and replaced the content of the files, but now when I will pull new changes, the content of those files will be overwritten again by the reverted earlier commit.
How can I handle this?
I accidentally committed files that should be in gitignore
You first have to remove them from the history.
You have few ways for doing it (revert, reset, checkout <commit> etc)
You can simply revert the code in your commit. This will undo your changes
revert <commit id>
reset HEAD <commit id>
This will "move" your branch to any given desired commit and then checkout branch and you are back with your old codeŚ„
Once you have the desired code you want push it to the remote with the -f/--force flag.
Add the file to the .gitignore so it will be undetectable by git.
If you still want the file in the repository (with default values for example) you should use the assume-unchanged flag on the tracked file.
https://git-scm.com/docs/git-update-index
When this flag is specified, the object names recorded for the paths are not updated.
Instead, this option sets/unsets the "assume unchanged" bit for the paths.When the "assume unchanged" bit is on, the user promises not to change the file and allows Git to assume that the working tree file matches what is recorded in the index. If you want to change the working tree file, you need to unset the bit to tell Git. This is sometimes helpful when working with a big project on a filesystem that has very slow lstat(2) system call (e.g. cifs).
Git will fail (gracefully) in case it needs to modify this file in the index e.g. when merging in a commit; thus, in case the assumed-untracked file is changed upstream, you will need to handle the situation manually.
Force push your new changes like this:
git push -f origin <your-branch>
