title: What is the behavior of git during rebase conflicts when choosing one but needing both?
body: <p>I'm trying to understand git rebase, but I'm having issues. I've read a number of forum posts and documentation to see if I can pin this down but the behavior seems odd to me so I can't wrap my head around it. </p>
  
  <p>Let's say I have a file, called <code>test.txt</code>.</p>
  
  <p>I have a branch, <code>Branch A</code>:</p>
  
  <p><code>text.txt</code> in <code>Branch A</code>:</p>
  
  <pre><code>Hello, World!
  
  Good... Thanks for asking!
  </code></pre>
  
  <p>and in <code>Branch B</code> the <code>text.txt</code> file looks like:</p>
  
  <pre><code>
  -&gt; How are you, robot?
  
  </code></pre>
  
  <p>I need both changes (let's pretend this isn't an easy copy and paste fix... I need to rebase). </p>
  
  <p>So...</p>
  
  <p><code>git checkout Branch B</code></p>
  
  <p><code>git rebase Branch A</code></p>
  
  <p>And then a merge conflict happens. It asks me if I want to keep one or the other...</p>
  
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt; 1234123hpdfaskdjf123234
  Hello, World!
  
  Good... Thanks for asking!
  ==========
  
  -&gt; How are you, robot?
  
  &gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt; some commit message
  </code></pre>
  
  <p>1) What do I do if I need both? 
  2) Do I only use one or the other or do I use a combination of both of them?
  3) If I use one, will the other block be available later?</p>