Step 1: From working directory of project , check out source branch and merge with target branch.

git checkout
git fetch origin
git merge origin/
git pull

Step 2: Resolve merge conflicts, test changes and push result commit to GitPlex.

git push origin

Step 1: 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

Step 2: Resolve rebase conflicts, test changes and force push result commit to GitPlex.

git push -f origin