At work I have a monitor with a much higher resolution than my mac - I'd like to avoid having to change font size every time I disconnect / reconnect to the monitor. Is resizing fonts dynamically possible?

If i merge, and there's conflicts in a file, I often end up in a weird situation that seems almost bugged. But maybe I'm doing it wrong.

So, I'll merge, and I click the file in source control, which opens it. I can see the changes, and say I hit 'accept current'. The red/green diff highlight disappears, but the file still has a ! and says there's conflicts. If I close the file, it says it has unhandled conflicts.. the only solution then is to hit 'open in merge editor'. So, #1 issue is, why isn't it resolved at this point??

Anyway, going into the merge editor, I see the diff area but its entirely red, and it says 'manual resolution' or 'reset to base'. Manual resolution is not clickable, so I assume it's wanting me to resolve it manually, but it's already merged correctly from when I hit 'accept current'. I can't click 'Complete Merge' at this point, because it's still wanting me to fix the red area.

Sometimes at this point I can put a space and then delete the space, and it accepts that i've done a manual edit and lets me complete the merge. But right now as I'm writing this post and testing it, it's not letting me.

What is going on? This happens constantly. And before anyone asks, no there's no other area in the file that has a conflict - I'm testing right now on a small .gitignore file.