• From working directory of project , check out source branch and merge with target branch
    git checkout
    git fetch origin
    git merge origin/
    git pull
  • Resolve merge conflicts, test changes and push result commit to OneDev
    git push origin
  • From working directory of project , check out source branch and rebase to destination branch
    git checkout
    git fetch origin
    git rebase origin/
    git pull --rebase
  • Resolve rebase conflicts, test changes and force push result commit to OneDev
    git push -f origin