title: How to rebase two branches with git?
body: <p>I am trying to rebase master into dev:</p>
  
  <pre><code>git rebase master
  </code></pre>
  
  <p>Then I get : Current branch is up to date.</p>
  
  <p>However when I check the difference between the two branches I get a conflict. Why does git not say something like conflict detected or something?</p>
  
  <p>See also here for a code <a href="https://github.com/dimitri-a/gitje" rel="nofollow noreferrer">sample</a></p>