I am some custom files/blocks at the moment. Can someone suggest me the best way to upgrade? Should I do all the files manually except the ones I have changed? I am afraid about the database and user passwords. Looking for suggestions who already done upgrading.

Too many typos..
I have some custom files I have edited. Should I keep them and upload every other remaining file through the FTP? Please give me some advice. Thanks