title: github pushing local copy to remote
body: <p>I created a branch locally and remotely. To synchronize the changes between local and master, I pulled the changes from master, rebased onto master and resolve the conflicts.</p>
  
  <pre><code>Changes on master
  
  A -- B
  
  Changes on local branch
  
  C -- D -- E -- F
  
  Local branch after rebase
  
  A -- B -- C -- D -- E -- F
  </code></pre>
  
  <p>However, when I subsequently tried to push the local branch to the remote branch. It prompts me to resolve conflicts again. After resolving the conflict, the history of commits is showing up</p>
  
  <pre><code>C -- D -- E -- F -- A -- B -- C -- D --E -- F
  </code></pre>
  
  <p>was expecting same as local branch after rebase as per below</p>
  
  <pre><code>A -- B -- C -- D -- E -- F
  </code></pre>
  
  <p>how to achieve the above?</p>