title: Git: Ahead and Behind together. How to solve?
body: <p>I have a commit with <code>1 ahead</code> and <code>6 behind</code>.</p>
  
  <p>What should I do in this situation? </p>
  
  <p>I think, that solution might be like this:
  <code>git push</code> 
  and after
  <code>git pull</code></p>
  
  <p>But I think, it can solve only <code>Behind</code>.<br>
  Maybe I am wrong. </p>
  
  <pre><code>-------*------*-----*-----*-----B
          \
           \
            \
             *-------A
  </code></pre>
  
  <p>I make my part and change sdk.<br>
  Now I want to merge with <code>B</code>. </p>