add
Step 1. Update the repo and checkout the branch we are going to merge
git fetch origin git checkout -b cas origin/cas
Step 2. Merge the branch and push the changes to GitLab
git checkout master git merge --no-ff cas git push origin master
# Conflicts: # src/pages/pms/storage/partShop/interface.d.ts