Git的Rebase命令【手把脚教学】

我不是女神ヾ 2022-12-30 07:49 145阅读 0赞

### 文章目录 ###

*   *  零、这是一个好东西
     *  一、Rebase和Merge【二选一】
     *   *  1、merge
         *  2、rebase
     *  二、一次实操记录
     *  三、合并多次提交记录

## 零、这是一个好东西 ##

[你可以点点看][Link 1]

## 一、Rebase和Merge【二选一】 ##

*  比如你有 master 分支 ，然后还有dev分支 ，master 用户线上发布 dev 用于开发，release 用于上线前测试验证 ，hotfix 用于线上问题解决，bugfix用于bug解决，feature用于你的开发。

### 1、merge ###

> 这个大家铁定都知道，因为用的实在是太多了，它大概的意思，我先举个栗子。  
> 在开发的过程中，团队中的所有研发在领到需求侯，都会基于dev拉取自己的分支比如feature/xy1、feature/xy2 ，在使用merge的情况下它的操作是这样的：  
> ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU_size_16_color_FFFFFF_t_70_pic_center]

### 2、rebase ###

> 已经知道了merge后整个图是非常的不beautiful，所以rebase这个变基操作就出现了。  
> reabse就是重新给你整理一下提交记录，让其合过去之后非常的beautiful。见图：  
> ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU_size_16_color_FFFFFF_t_70_pic_center 1]

## 二、一次实操记录 ##

>     # 当前分支是feature/当前分支[你自己的分支]V1 我们将 feature/xy01rebase到当前分支上
>     D:\workspace\xywork\rebase-demo>git rebase feature/xy01
>     First, rewinding head to replay your work on top of it...
>     Applying: feature/当前分支[你自己的分支]V1
>     .git/rebase-apply/patch:78: trailing whitespace.
>     
>     .git/rebase-apply/patch:82: trailing whitespace.
>     要检出项目并从源代码构建, 请执行以下操作:
>     .git/rebase-apply/patch:1006: trailing whitespace.
>     
>     .git/rebase-apply/patch:1087: trailing whitespace.
>     
>     .git/rebase-apply/patch:1690: trailing whitespace.
>     
>     warning: squelched 57 whitespace errors
>     warning: 62 lines add whitespace errors.
>     Using index info to reconstruct a base tree...
>     Falling back to patching base and 3-way merge...
>     CONFLICT (add/add): Merge conflict in pom.xml
>     Auto-merging pom.xml
>     CONFLICT (add/add): Merge conflict in rebase-demo-server/src/main/resources/application.yml
>     Auto-merging rebase-demo-server/src/main/resources/application.yml
>     CONFLICT (add/add): Merge conflict in rebase-demo-server/src/main/resources/application-dev.yml
>     Auto-merging rebase-demo-server/src/main/resources/application-dev.yml
>     CONFLICT (add/add): Merge conflict in rebase-demo-server/src/main/java/com/yangzai/xywork/server/tree/DossierTreeLogic.java
>     Auto-merging rebase-demo-server/src/main/java/com/yangzai/xywork/server/tree/DossierTreeLogic.java
>     CONFLICT (add/add): Merge conflict in rebase-demo-server/src/main/java/com/yangzai/xywork/server/timer/TimerTask.java
>     Auto-merging rebase-demo-server/src/main/java/com/yangzai/xywork/server/timer/TimerTask.java
>     CONFLICT (add/add): Merge conflict in rebase-demo-server/src/main/java/com/yangzai/xywork/server/service/cache/MobileCacheService.java
>     Auto-merging rebase-demo-server/src/main/java/com/yangzai/xywork/server/service/cache/MobileCacheService.java
>     CONFLICT (add/add): Merge conflict in rebase-demo-server/src/main/java/com/yangzai/xywork/server/service/SearchService.java
>     Auto-merging rebase-demo-server/src/main/java/com/yangzai/xywork/server/service/SearchService.java
>     CONFLICT (add/add): Merge conflict in rebase-demo-server/src/main/java/com/yangzai/xywork/server/jcy/JcyUserRightApi.java
>     Auto-merging rebase-demo-server/src/main/java/com/yangzai/xywork/server/jcy/JcyUserRightApi.java
>     CONFLICT (add/add): Merge conflict in rebase-demo-server/src/main/java/com/yangzai/xywork/server/jcy/JcyFileDownLoadApi.java
>     Auto-merging rebase-demo-server/src/main/java/com/yangzai/xywork/server/jcy/JcyFileDownLoadApi.java
>     CONFLICT (add/add): Merge conflict in rebase-demo-server/src/main/java/com/yangzai/xywork/server/xyworkApplication.java
>     Auto-merging rebase-demo-server/src/main/java/com/yangzai/xywork/server/xyworkApplication.java
>     CONFLICT (add/add): Merge conflict in rebase-demo-server/pom.xml
>     Auto-merging rebase-demo-server/pom.xml
>     CONFLICT (add/add): Merge conflict in rebase-demo-security/src/main/java/com/yangzai/xywork/security/filter/AuthenticationFilter.java
>     Auto-merging rebase-demo-security/src/main/java/com/yangzai/xywork/security/filter/AuthenticationFilter.java
>     CONFLICT (add/add): Merge conflict in rebase-demo-security/pom.xml
>     Auto-merging rebase-demo-security/pom.xml
>     CONFLICT (add/add): Merge conflict in rebase-demo-rmi/src/main/java/com/yangzai/xywork/rmi/service/YjgjService.java
>     Auto-merging rebase-demo-rmi/src/main/java/com/yangzai/xywork/rmi/service/YjgjService.java
>     CONFLICT (add/add): Merge conflict in rebase-demo-rmi/pom.xml
>     Auto-merging rebase-demo-rmi/pom.xml
>     CONFLICT (add/add): Merge conflict in rebase-demo-domain/src/main/java/com/yangzai/xywork/domain/MaterialResource.java
>     Auto-merging rebase-demo-domain/src/main/java/com/yangzai/xywork/domain/MaterialResource.java
>     CONFLICT (add/add): Merge conflict in rebase-demo-common/src/main/java/com/yangzai/xywork/common/util/EtagUtils.java
>     Auto-merging rebase-demo-common/src/main/java/com/yangzai/xywork/common/util/EtagUtils.java
>     CONFLICT (add/add): Merge conflict in rebase-demo-common/src/main/java/com/yangzai/xywork/common/message/MaterialTypeEnum.java
>     Auto-merging rebase-demo-common/src/main/java/com/yangzai/xywork/common/message/MaterialTypeEnum.java
>     CONFLICT (add/add): Merge conflict in rebase-demo-common/src/main/java/com/yangzai/xywork/common/message/AdapterMessageEnum.java
>     Auto-merging rebase-demo-common/src/main/java/com/yangzai/xywork/common/message/AdapterMessageEnum.java
>     CONFLICT (add/add): Merge conflict in README.md
>     Auto-merging README.md
>     error: Failed to merge in the changes.
>     hint: Use 'git am --show-current-patch' to see the failed patch
>     Patch failed at 0001 feature/当前分支[你自己的分支]V1
>     Resolve all conflicts manually, mark them as resolved with
>     "git add/rm <conflicted_files>", then run "git rebase --continue".
>     You can instead skip this commit: run "git rebase --skip".
>     To abort and get back to the state before "git rebase", run "git rebase --abort".
>     #这里有一堆打印 可以仔细看看都干了什么，然后我们看一下当前分支的状态
>     D:\workspace\xywork\rebase-demo>git  status
>     rebase in progress; onto bf22de1
>     You are currently rebasing branch 'feature/xyfeature/当前分支[你自己的分支]' on 'bf22de1'.
>       (fix conflicts and then run "git rebase --continue")
>       (use "git rebase --skip" to skip this patch)
>       (use "git rebase --abort" to check out the original branch)
>     
>     Changes to be committed:
>       (use "git reset HEAD <file>..." to unstage)
>     
>             new file:   rebase-demo-osr/pom.xml
>             new file:   rebase-demo-osr/src/main/java/com/yangzai/xywork/osr/autoconfig/RestTemplateConfiguration.java
>             new file:   rebase-demo-osr/src/main/java/com/yangzai/xywork/osr/autoconfig/UimSdkConfiguration.java
>             new file:   rebase-demo-osr/src/main/java/com/yangzai/xywork/osr/autoconfig/UserRightAutoConfiguration.java
>             new file:   rebase-demo-osr/src/main/java/com/yangzai/xywork/osr/user/IUserService.java
>             new file:   rebase-demo-osr/src/main/java/com/yangzai/xywork/osr/user/UimApiResult.java
>             new file:   rebase-demo-osr/src/main/java/com/yangzai/xywork/osr/user/UimApiUserService.java
>             new file:   rebase-demo-osr/src/main/java/com/yangzai/xywork/osr/user/UimSdkUserService.java
>             new file:   rebase-demo-osr/src/main/java/com/yangzai/xywork/osr/user/UimServerConfig.java
>     ## 这么多需要merge的文件
>     Unmerged paths:
>       (use "git reset HEAD <file>..." to unstage)
>       (use "git add <file>..." to mark resolution)
>     
>             both added:      README.md
>             both added:      rebase-demo-common/src/main/java/com/yangzai/xywork/common/message/AdapterMessageEnum.java
>             both added:      rebase-demo-common/src/main/java/com/yangzai/xywork/common/message/MaterialTypeEnum.java
>             both added:      rebase-demo-common/src/main/java/com/yangzai/xywork/common/util/EtagUtils.java
>             both added:      rebase-demo-domain/src/main/java/com/yangzai/xywork/domain/MaterialResource.java
>             both added:      rebase-demo-rmi/pom.xml
>             both added:      rebase-demo-rmi/src/main/java/com/yangzai/xywork/rmi/service/YjgjService.java
>             both added:      rebase-demo-security/pom.xml
>             both added:      rebase-demo-security/src/main/java/com/yangzai/xywork/security/filter/AuthenticationFilter.java
>             both added:      rebase-demo-server/pom.xml
>             both added:      rebase-demo-server/src/main/java/com/yangzai/xywork/server/xyworkApplication.java
>             both added:      rebase-demo-server/src/main/java/com/yangzai/xywork/server/jcy/JcyFileDownLoadApi.java
>             both added:      rebase-demo-server/src/main/java/com/yangzai/xywork/server/jcy/JcyUserRightApi.java
>             both added:      rebase-demo-server/src/main/java/com/yangzai/xywork/server/service/SearchService.java
>             both added:      rebase-demo-server/src/main/java/com/yangzai/xywork/server/service/cache/MobileCacheService.java
>             both added:      rebase-demo-server/src/main/java/com/yangzai/xywork/server/timer/TimerTask.java
>             both added:      rebase-demo-server/src/main/java/com/yangzai/xywork/server/tree/DossierTreeLogic.java
>             both added:      rebase-demo-server/src/main/resources/application-dev.yml
>             both added:      rebase-demo-server/src/main/resources/application.yml
>             both added:      pom.xml
>     
>     # 如果不解决冲突 直接continue是会有下面的提醒
>     D:\workspace\xywork\rebase-demo>git rebase --continue
>     README.md: needs merge
>     rebase-demo-common/src/main/java/com/yangzai/xywork/common/message/AdapterMessageEnum.java: needs merge
>     rebase-demo-common/src/main/java/com/yangzai/xywork/common/message/MaterialTypeEnum.java: needs merge
>     rebase-demo-common/src/main/java/com/yangzai/xywork/common/util/EtagUtils.java: needs merge
>     rebase-demo-domain/src/main/java/com/yangzai/xywork/domain/MaterialResource.java: needs merge
>     rebase-demo-rmi/pom.xml: needs merge
>     rebase-demo-rmi/src/main/java/com/yangzai/xywork/rmi/service/YjgjService.java: needs merge
>     rebase-demo-security/pom.xml: needs merge
>     rebase-demo-security/src/main/java/com/yangzai/xywork/security/filter/AuthenticationFilter.java: needs merge
>     rebase-demo-server/pom.xml: needs merge
>     rebase-demo-server/src/main/java/com/yangzai/xywork/server/xyworkApplication.java: needs merge
>     rebase-demo-server/src/main/java/com/yangzai/xywork/server/jcy/JcyFileDownLoadApi.java: needs merge
>     rebase-demo-server/src/main/java/com/yangzai/xywork/server/jcy/JcyUserRightApi.java: needs merge
>     rebase-demo-server/src/main/java/com/yangzai/xywork/server/service/SearchService.java: needs merge
>     rebase-demo-server/src/main/java/com/yangzai/xywork/server/service/cache/MobileCacheService.java: needs merge
>     rebase-demo-server/src/main/java/com/yangzai/xywork/server/timer/TimerTask.java: needs merge
>     rebase-demo-server/src/main/java/com/yangzai/xywork/server/tree/DossierTreeLogic.java: needs merge
>     rebase-demo-server/src/main/resources/application-dev.yml: needs merge
>     rebase-demo-server/src/main/resources/application.yml: needs merge
>     pom.xml: needs merge
>     #这句话说的多好啊，你必须先merge然后使用git add添加 标记为解决
>     You must edit all merge conflicts and then
>     mark them as resolved using git add
>     
>     D:\workspace\xywork\rebase-demo>git rebase --continue
>     README.md: needs merge
>     rebase-demo-common/src/main/java/com/yangzai/xywork/common/message/AdapterMessageEnum.java: needs merge
>     rebase-demo-common/src/main/java/com/yangzai/xywork/common/message/MaterialTypeEnum.java: needs merge
>     rebase-demo-common/src/main/java/com/yangzai/xywork/common/util/EtagUtils.java: needs merge
>     rebase-demo-domain/src/main/java/com/yangzai/xywork/domain/MaterialResource.java: needs merge
>     rebase-demo-rmi/pom.xml: needs merge
>     rebase-demo-rmi/src/main/java/com/yangzai/xywork/rmi/service/YjgjService.java: needs merge
>     rebase-demo-security/pom.xml: needs merge
>     rebase-demo-security/src/main/java/com/yangzai/xywork/security/filter/AuthenticationFilter.java: needs merge
>     rebase-demo-server/pom.xml: needs merge
>     rebase-demo-server/src/main/java/com/yangzai/xywork/server/xyworkApplication.java: needs merge
>     rebase-demo-server/src/main/java/com/yangzai/xywork/server/jcy/JcyFileDownLoadApi.java: needs merge
>     rebase-demo-server/src/main/java/com/yangzai/xywork/server/jcy/JcyUserRightApi.java: needs merge
>     rebase-demo-server/src/main/java/com/yangzai/xywork/server/service/SearchService.java: needs merge
>     rebase-demo-server/src/main/java/com/yangzai/xywork/server/service/cache/MobileCacheService.java: needs merge
>     rebase-demo-server/src/main/java/com/yangzai/xywork/server/timer/TimerTask.java: needs merge
>     rebase-demo-server/src/main/java/com/yangzai/xywork/server/tree/DossierTreeLogic.java: needs merge
>     rebase-demo-server/src/main/resources/application-dev.yml: needs merge
>     rebase-demo-server/src/main/resources/application.yml: needs merge
>     pom.xml: needs merge
>     You must edit all merge conflicts and then
>     mark them as resolved using git add
>     #使用Idea的话我们直接在项目中找到对应文件 点击去会看到见代码块后面的图
>     #使用git add 或者在idea中右键add 后 再次执行git rebase --continue
>     #就可以rebase成功
>     D:\workspace\xywork\rebase-demo>git rebase --continue
>     Applying: feature/当前分支[你自己的分支]V1
> 
> ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU_size_16_color_FFFFFF_t_70_pic_center 2]

> 我们可以使用git push 进行推送 ，如果我们变更了远程的提交记录就git push -f 记住慎用而且一定不要在公共分支上用，自己的分支上用就行了 ，然后可以去gitlab上提交PR 等主程合并即可。

## 三、合并多次提交记录 ##

*  由于我们的提交记录经常会出现下面这种
 *  一次提交、写了点什么、又一次提交等等
 *  ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU_size_16_color_FFFFFF_t_70_pic_center 3]  
    、对于这种东西我们显然不希望别人看到，当然看到了也会被骂，所以我们需要搞一搞，
 *  如果没有push到远端我们可以使用以下方式及时止损：

> 由于我们辛辛苦苦的划水四次 所以我们使用  
> git rebase -i HEAD~4  
> ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU_size_16_color_FFFFFF_t_70_pic_center 4]  
> 下面我们就合并一下  
> ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU_size_16_color_FFFFFF_t_70_pic_center 5]  
> ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU_size_16_color_FFFFFF_t_70_pic_center 6]  
> ![在这里插入图片描述][20201224144723628.png_pic_center]
> 
>     D:\workspace\xy\demo>git rebase --abort
>     
>     D:\workspace\ydyj\m-dossier>git rebase -i  HEAD~4
>     [detached HEAD 8650d43] dosomething
>      Date: Thu Dec 24 14:23:08 2020 +0800
>      1 file changed, 2 insertions(+), 1 deletion(-)
>     Warning: commit message did not conform to UTF-8.
>     You may want to amend it after fixing the message, or set the config
>     variable i18n.commitencoding to the encoding your project uses.
>     [detached HEAD 7bb0073] do agaginï¼
>      1 file changed, 1 insertion(+), 1 deletion(-)
>     Successfully rebased and updated refs/heads/feature/xy划水教学.

*  今天先划到这儿。

[Link 1]: https://learngitbranching.js.org/?locale=zh_CN
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU_size_16_color_FFFFFF_t_70_pic_center]: /images/20221120/8803cedebf1e47f19d6be6aad3330dd6.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU_size_16_color_FFFFFF_t_70_pic_center 1]: /images/20221120/92975e9048e1411a9494ca2f71fd2e9b.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU_size_16_color_FFFFFF_t_70_pic_center 2]: https://img-blog.csdnimg.cn/20201224141902380.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU=,size_16,color_FFFFFF,t_70#pic_center
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU_size_16_color_FFFFFF_t_70_pic_center 3]: https://img-blog.csdnimg.cn/20201224142422936.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU=,size_16,color_FFFFFF,t_70#pic_center
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU_size_16_color_FFFFFF_t_70_pic_center 4]: https://img-blog.csdnimg.cn/20201224142838769.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU=,size_16,color_FFFFFF,t_70#pic_center
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU_size_16_color_FFFFFF_t_70_pic_center 5]: https://img-blog.csdnimg.cn/20201224144619589.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU=,size_16,color_FFFFFF,t_70#pic_center
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU_size_16_color_FFFFFF_t_70_pic_center 6]: https://img-blog.csdnimg.cn/20201224144650377.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L1lhbmd6YWlMZUhlSGU=,size_16,color_FFFFFF,t_70#pic_center
[20201224144723628.png_pic_center]: https://img-blog.csdnimg.cn/20201224144723628.png#pic_center