git add .
git commit -m "fix: 备注"
git push origin master
# 切换到你想合并到的分支
git checkout master
# 合并特定分支,例如feature-branch,到当前分支
git merge feature-branch
git add .
git commit -m "fix: 备注"
git push origin master
# 切换到你想合并到的分支
git checkout master
# 合并特定分支,例如feature-branch,到当前分支
git merge feature-branch