If you use vscode, try out the merge editor. It’s a lot clearer to me when the merge diffs are huge.

I would also say to check out the latest branch for each file you commit. If your file is file.tsx checkout file.tsx in the main branch to make sure you know what you’re changing.