Git rebase, fix conflicts, then push is rejected : <p>When I <strong>rebase</strong>, and there are <strong>conflicts which I then resolve</strong>, I get the following message:</p>

<blockquote>
  <p>hint: Updates were rejected because the tip of your current branch is behind</p>
</blockquote>

<hr>

<p>We have 2 branches:</p>

<ul>
<li><code>master</code> is our base</li>
<li><code>feature/fix-input-height</code> (new feature to merge into master)</li>
</ul>

<p>I am preparing <code>feature/fix-input-height</code> by rebasing master to locally resolve conflicts</p>

<pre><code>git checkout master
git pull origin master

git checkout feature/fix-input-height
git pull origin feature/fix-input-height

git rebase master
</code></pre>

<hr>

<ul>
<li>Conflicts arise</li>
<li>I resolve them</li>
<li>Then attempt to push the new feature branch</li>
</ul>

<pre><code>git push origin feature/fix-input-height
</code></pre>

<p>And end up with that <strong>rejected error message</strong> again:</p>

<blockquote>
  <p>hint: Updates were rejected because the tip of your current branch is behind</p>
</blockquote>

<hr>

<p>Everyone on stackoverflow suggests:</p>

<pre><code>git push origin -f feature/fix-input-height
</code></pre>

<p><strong>But forcing the push just feels wrong</strong></p>
