title: which lines to delete when trying to fix conflict errors in a git branch
body: <p>I am trying to update a development branch with new changes made to the master branch.</p>
  <p>So I did this command:</p>
  <pre><code>'git checkout master'
  'git pull'
  'git checkout NewCombatBranch'
  'git rebase master'
  </code></pre>
  <p>And it said I had some conflicts.</p>
  <p>I went to the git documentation to help me understand how to fix the conflicts.</p>
  <p>But when viewing the conflicts in the affected file, I'm totally unsure what to do.</p>
  <p>Here are the conflicts in the file:</p>
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  function getShip(startSignal, isCaptialShip) {
      var isMotherShip = (startSignal) === &quot;X1&quot; ? true : false
  
      if (isCaptialShip) {
          return &quot;war&quot;;
      } else (isMotherShip) {
          return &quot;populate&quot;;
      } 
  }
  
  function isMotherShipSignal(gameTime) {
      if ((gameTime) === &quot;0001-01-01T00:00:00-05:00&quot;) {
  =======
  function getShip(isDestroyed, startSignal, isCaptialShip) {
      var isMotherShip = (startSignal) === &quot;0000X1&quot; ? true : false
      
      if (isWarShip) {
          return &quot;war&quot;;
      } else (isMotherShip) {
          return &quot;populate&quot;;
      }
  }
  
  function isMotherShipSignal(gameTime) {
      if (new Date(gameTime).toLocaleTimeString('en-US') === &quot;12:00:00 AM&quot;) {
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; fixed battle change errors
          return true;
      }
      return false;
  }
  </code></pre>
  <p>Looking at this, I'm not sure what to keep and what to discard.</p>
  <p>I know I need the new changes in my master branch...but I am not sure what I'm really looking at.</p>
  <p>Should I delete the ones that said HEAD?</p>
  <p>Thanks!</p>