Rebasing develop branch from the latest changes of master branch.
git clone http://projectA.git -b develop
git pull --rebase origin master
# Resolve merge conflicts
git add <the resolved files>
git rebase --continue
git commit -m "Merged from master branch" # or git commit --amend -m "Overwriting the current commit"