title: Git Merge Workflow
body: <p>Here is my solution for the merge workflow using VSTS and Git, diagram provided below.</p>
  
  <p>This works but, seemingly, there are 2 redundant steps to prevent merge conflicts. I'm hoping that someone might have an easier way to do it in 1 step. If I rebase each branch, this will work but I'm trying to avoid that method. My steps include:</p>
  
  <ol>
  <li>Make a dev branch, off master, and supplementary branches for features from dev.</li>
  <li>Pull code into dev branch from feature branches.</li>
  <li>Pull master into dev and resolve conflicts.</li>
  <li>Pull dev into master once conflicts have been resolved.</li>
  <li>Pull master back into dev so that commit history is the same. </li>
  </ol>
  
  <p><img src="https://i.stack.imgur.com/zr6M7.png" alt="Git Workflow Image"></p>