title: Merge feature branch with parent branch
body: <p>I have created a feature branch(parent branch is v8.2) 2 weeks ago. Now i have few code changes made in feature branch. I have to integrate this feature branch with its parent branch.</p>
  
  <p>can i follow following steps:</p>
  
  <pre><code>git checkout -b "topic branch" origin/v8.2
  git merge feature-branch
  </code></pre>
  
  <p>and whats the difference in doing this </p>
  
  <pre><code>git checkout -b "topic branch" origin/feature-branch
  git merge parentbranch
  </code></pre>
  
  <p>please let me know as i am new to git this is bit confusing.</p>