How to get changes from another branch
<p>I am currently working on <code>featurex</code> branch. Our master branch is named <code>our-team</code>. Since I started working on <code>featurex</code>, more changes have been made to branch <code>our-team</code>.</p>
<p>I have done this locally to get all the latest changes from <code>our-team</code>:</p>
<pre><code>git checkout our-team
git pull
</code></pre>
<p>Before I push <code>featurex</code> for merging, I would locally like to get all changes from <code>our-team</code> branch into <code>featurex</code> so that I can ensure everything works as expected.</p>
<p>How can I do that?</p>