Merge then review
Move fast and break things. Merge vulnerabilities. Double the work. Merge code without tests. Anything, but don't let code become stale.
You're viewing a single thread.
Better yet just edit files live on prod from Notepad (not plus plus) over Samba for "xtreme moral" boost
The amount of times where I had to fix things in live production servers is not a small number. Then again, we are only humans. Backup often and you are golden.