git-cherry使用

git cherry-pick冲突解决：

我使用的vscode, 选择incomming，没实际图片，不贴了。。。

解决冲突后，

git add .

再，

git cherry-pick --continue

然后 git push 即可

若：

remote: GitLab: You are not allowed to push code to protected branches on this project.To *.git! [remote rejected] * -> * (pre-receive hook declined)

是因为：

there's no problem - everything works as expected.

In GitLab some branches can be protected. By default only Maintainer/Owner users can commit to protected branches (see permissions docs). master branch is protected by default - it forces developers to issue merge requests to be validated by project maintainers before integrating them into main code.

You can turn on and off protection on selected branches in Project Settings (where exactly depends on GitLab version - see instructions below).

On the same settings page you can also allow developers to push into the protected branches. With this setting on, protection will be limited to rejecting operations requiring git push --force (rebase etc.)