title: Pull from remote repo without a commit history?
body: <p>I am working on a project on a gitHub with my friends, and I want to know if there is any way we can pull (update) our local repo without a "pulling commit"?</p>
  
  <p>Here is the simplified example of the story:</p>
  
  <p>My friend and I had the same copy of the source code from remote repo on our local repo.</p>
  
  <p>Example Source code:</p>
  
  <pre><code>&lt;p&gt; This is the title &lt;/p&gt;
  &lt;p&gt; I love to code &lt;/p&gt;
  </code></pre>
  
  <p>Now my friend decided to add another line of code to the original one:</p>
  
  <pre><code>&lt;p&gt; Adding important text &lt;/p&gt;
  </code></pre>
  
  <p>He then committed and pushed to the remote repo. After that, I pulled from the remote repo. Now I also have what my friend added.</p>
  
  <p>Then my friend decided to remove that line of code :</p>
  
  <pre><code>&lt;p&gt; Adding important text &lt;/p&gt;
  </code></pre>
  
  <p>Now I have to pull (update) again, but the thing is, because my local has that Added line of code, I am required to make a commit (Merge). Then when I push, that commit is going to be there. This means that there are 2 commits with the same change (my friend's commit and my commit's --with different messages, of course)</p>
  
  <p>My question is, is there a better way to deal with this problem? Is there a way to avoid unnecessary commits? I know we should wait until we really sure about the changes before we push to the remote, but things happen.</p>