If you want to merge from branch(test) to master, you can follow these steps:
Step1: Go to the branch
git checkout test
Step2: git pull --rebase origin master
Step3: If there are some conflicts, go to these files to modify it.
Step4: Add these changes
git add # your_changes_files
Step5: git rebase --continue
Step6: if there is still conflict, go back to Step3 again. If there is no conflict, do following: git push origin +test
Step7: and then there is no conflict between test and master. you can use merge directly.