Maintain multiple git branch while working same files

Question

I\'ve a requirement where I need to ship two features X and Y. Both these features touch sames files. Problem is the client may ask to pull out the