Merge the incoming changes into the current branch和Rebase the current branch on top of the incoming

在用Idea来git更新项目时会出现如下提示:
Merge the incoming changes into the current branch和Rebase the current branch on top of the incoming_第1张图片

Merge the incoming changes into the current branch:将传入的更改合并到当前分支中(常用)

Rebase the current branch on top of the incoming changes:在传入更改的基础上重新建立当前分支

你可能感兴趣的:(Merge the incoming changes into the current branch和Rebase the current branch on top of the incoming)