title: Resolving merge conflict merged in both source and target branch
body: <p>I have two branches:<br>
  <strong>Branch 'dev'</strong><br>
  <strong>Branch 'prod'</strong></p>
  
  <p>'dev' is where all features are consolidated, 'prod' is the production branch. Before new releases, 'dev' is merged to 'prod' and a release build is made from it.</p>
  
  <p><strong>The 'prod' branch has certain things like ads which I do not want in the 'dev' branch.</strong></p>
  
  <p>Today while merging 'dev' to 'prod', I got a merge conflict. Resolving the merge changed both my source branch 'dev' and target branch 'prod'. As such I am having many parts of code from target to source which I do not want.</p>
  
  <p>What is the best way to keep the changes in 'prod' but undo them in 'dev'?
  Thanks.</p>