You are in control of what gets applied. The diff viewer now lets you select and deselect individual changes, so you can accept exactly the ones you want and leave the rest.