title: Have git raise a merge conflict for differences between branches
body: <p>I have a github branch that has tons of changes that aren't on the main branch. When I attempt to merge the changes branch into the main branch, git automatically merges a significant amount of the content, and raises conflicts for instances in which the additions are directly integrated into existing html or javascript.</p>
  
  <p>What I would like is for git to raise a merge conflict for all instances in which a difference exists between the two branches, so I could go through and approve every addition. </p>
  
  <p>I have tried the 'ours' strategy, but this simply did a force merge, keeping all incoming changes from what I can tell. </p>
  
  <p>Is there a way I can trigger a merge conflict for all differences between the two branches when merging them? Or a similar function that would facilitate the combining of these branches in a careful way? I'm aware of using git diff, but I was hoping something existed more like what occurs in resolving a merge conflict.  </p>