title: Need help to understand merge conflict example
body: <p>I am following an example from a book which does not show the step to resolve a merge conflict. The tutorial which teaches that did not work for me as mentioned in this post - <a href="https://stackoverflow.com/questions/24094185/simulate-multiple-users-committers-on-local-system">Simulate multiple users/committer&#39;s on local system</a>
  So, I could not even learn the merge.</p>
  <p>Here are the steps copied from the book -</p>
  <p>Now open the  blank <code>participants.txt</code> file and paste the following lines in it:
  (<strong>I added a hyphen before each name</strong>)</p>
  <pre><code>Finance team
   Charles
   Lisa
   John
   Stacy
   Alexander
  </code></pre>
  <p>Git code -</p>
  <pre><code>git init
  git add .
  git commit -m 'Initial list for finance team'
  </code></pre>
  <p>Create a new branch called  marketing using the following syntax:</p>
  <pre><code>git checkout -b marketing
  </code></pre>
  <p>Now open the <code>participants.txt</code> file and start entering the names for the marketing department below the finance team list, as follows:
  (<strong>I added a hyphen before each name</strong>)</p>
  <pre><code>Marketing team
   Collins
   Linda
   Patricia
   Morgan
  </code></pre>
  <p>Git code -</p>
  <pre><code>git add .
  git commit -m 'Unfinished list of marketing team'
  git checkout master
  </code></pre>
  <p>Open the file and delete the names Alexander and Stacy, save, close, add the changes, and commit
  with the commit message  Final list from Finance team .</p>
  <pre><code>git add .
  git commit -m &quot;Final list from Finance team&quot;
  git checkout marketing
  </code></pre>
  <p>Open the file and add the fifth name, Amanda, for the marketing team, save, add, and commit.</p>
  <pre><code>git add .
  git commit -m &quot;Initial list of marketing team&quot;
  </code></pre>
  <p>Say the same names entered for marketing have been confirmed; now we need to merge these two lists, which can be done by the following command.</p>
  <pre><code>git merge master
  </code></pre>
  <p>You will get a merge conflict as shown in the following screenshot. Resolve them.</p>
  <pre><code>Auto-merging participants.txt
  CONFLICT (content): Merge conflict in participants.txt
  Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  <p><strong>How do I resolve those conflicts ?</strong></p>
  <p>The text in the file is as follows -</p>
  <pre><code>Finance team
  -Charles
  -Lisa
  -John
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  -Stacy
  -Alexander
  
  Marketing team
  - Collins
  - Linda
  - Patricia
  - Morgan
  - Amanda
  =======
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; master
  </code></pre>