I often forget to push a few things depending on how Git decides to label my work. Today it labeled a move as a file deletion and add, and only the deletion is present on the upstream, and now the upstream doesn’t even compile properly. And I don’t want to pull out my hair to resolve yet another conflict, because the only help with Git I can get is jUsT reAD ThE WhoLE maNUaL.
One other thing is that I refuse to use VSCode, especially since they’re pushing AI slop code generation so much, and I use KATE instead.
The problem is that uncommited files in the repo isnt unusual, often people have test files or logs, that you dont want to commit.
I personally use
git gui, which will show all the files that arent committed, so that may be a solution for you.Then I add those to
.gitignore, so I won’t forget the files I need to commit, so I don’t have to dive through AI slop articles about git to resolve merge conflicts (often things that should have been automatically resolved, except someone didn’t have basic common sense)..gitignore is good for stuff that will always be there, but is less good for small one-off files and other detritus.
But if your happy maintaining .gitignore correctly,
git add .before commit and youll never miss a file again. You may accidentally commit a secrets file, but thats a different problem for a different day.You can git add even if the file is ‘listed’ in the .gitignore though? Maybe use -f IIRC
Doesnt seem so:
But -f works: