So I'm pretty green at Git and VSCode. Assuming I'm using a fresh 1.16.2 branch, and I merge a feature branch like BW Pokémon Status Screen into it, I am not supposed to accept every incoming change? Because that was bad juju. Make don't make no more. So there were about 11 changes and 90 additions....

I'm assuming I want to keep my files and only accept the ones necessary for the feature? Are a lot of the incoming changes trying to revert files to the previous code in the feature branch?

Any tips would be appreciated... I don't mind a puzzle, but I'm trying to find the puzzles