How to push/merge code from a feature branch into another integration branch in git?
<p>I have the following setup strategy for releasing multiple features to a common uat environment (integration). As soon as I am done with one feature, I eventually want to merge that feature, and only the contents of that, feature into the release branch, and then finally into the master branch.</p>

<pre><code> origin/master
      |__origin/release
      |__origin/integration
      |__origin/featureOne
      |__origin/featureTwo
</code></pre>

<p>My question is how do I merge the contents of a local branch <strong>featureOne</strong> into the remote branch <strong>origin/integration</strong>?</p>

<p>This is what I am currently doing:</p>

<ol>
<li>git clone <code>http://mygitServer/myGroupName/myApp.git</code></li>
<li><code>git checkout featureOne</code></li>
<li>Perform some code changes</li>
<li><code>git add fileName</code></li>
<li><code>git commit --message 'Comment for my code change'</code></li>
<li><code>git push</code></li>
</ol>

<p>The last git command, push, pushes the new code in my local branch from the local repository to our gitlab remote server. specifically into <strong>origin/featureOne</strong></p>

<ol>
<li><p>What is the git command to merge my local/featureOne to the origin/integration branch? </p></li>
<li><p>Or would it make more sense to merge origin/featureOne into origin/integration? What would be the git command be for that?</p></li>
</ol>

<p>Thanks.</p>