cody-a
12/1/2016 - 5:03 PM

Resolve Merge Conflicts

Resolve Merge Conflicts

# Start on master branch
git fetch origin master
git checkout feature/branch-name
git merge FETCH_HEAD