I have two branches, master and develop. master deploys to a production environment, and develop deploys to a development environment.
I want to make a change to master that involves deleting a large amount of code. However, I don't want to make this same change to develop.
In this situation, is it OK for me to make a branch off of master (let's call it update-master), delete all the unwanted code on update-master, and then merge it back into master, but leave develop as-is? If I do this, will I be able to merge develop back into master later on, or will the unique merge from update-master prevent me from merging develop back into master?