[Git][多人协作][下]详细讲解

embedded/2024/9/23 8:29:06/

目录


1.多人协作>不同分支下多人协作

  • ⼀般情况下,如果有多需求需要多⼈同时进⾏开发,是不会在⼀个分⽀上进⾏多⼈开发,⽽是⼀个需求或⼀个功能点就要创建⼀个feature分⽀
  • 情景设置
    • 目标:远程main分支下新增func1func2文件
    • 实现:开发者A新增func1,开发者B新增func2
    • 条件:不同分支下协作完成,各自让某一个功能私有某一个分支
  • 开发者A:在自己分支上,正常推送,没有问题
    $ vim func1
    $ cat func1
    fun1 from A$ git add .
    $ git commit -m "A push func1"
    [feature-1 84e77e0] A push func11 file changed, 1 insertion(+)create mode 100644 func1$ git push origin feature-1
    Enumerating objects: 4, done.
    Counting objects: 100% (4/4), done.
    Delta compression using up to 20 threads
    Compressing objects: 100% (2/2), done.
    Writing objects: 100% (3/3), 318 bytes | 159.00 KiB/s, done.
    Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
    To github.com:DieSnowK/Git-Learn.git10cd204..84e77e0  feature-1 -> feature-1
    
  • 开发者B:在自己分支上,正常推送,没有问题
    $ cat func2
    fun2 fron B$ git add .
    $ git commit -m "B push func2"
    [feature-2 31c8cbb] B push func21 file changed, 1 insertion(+)create mode 100644 func2$ git push origin feature-2
    Enumerating objects: 4, done.
    Counting objects: 100% (4/4), done.
    Delta compression using up to 20 threads
    Compressing objects: 100% (2/2), done.
    Writing objects: 100% (3/3), 343 bytes | 343.00 KiB/s, done.
    Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
    To github.com:DieSnowK/Git-Learn.git10cd204..31c8cbb  feature-2 -> feature-2
    PS C:\Users\w1752\Desktop\My_Repository\Git-Learn>
    
  • 至此,开发者A和开发者B都互相看不到对方开发的文档,并且在自己的分支上各自推送时,没有任何冲突,两人互不影响,开发起来很丝滑
  • 假如此时开发者B无法继续完成文档开发,需要开发者A接手,该怎么办?
    • 开发者B将自己的分支名告诉开发者A,开发者A从远端仓库将该分支拉下来
      $ git branch
      * feature-1main$ git pull
      remote: Enumerating objects: 4, done.
      remote: Counting objects: 100% (4/4), done.
      remote: Compressing objects: 100% (2/2), done.
      remote: Total 3 (delta 0), reused 3 (delta 0), pack-reused 0
      Unpacking objects: 100% (3/3), 323 bytes | 323.00 KiB/s, done.
      From github.com:DieSnowK/Git-Learn* [new branch]      feature-2  -> origin/feature-2
      There is no tracking information for the current branch.
      Please specify which branch you want to merge with.
      See git-pull(1) for details.git pull <remote> <branch>If you wish to set tracking information for this branch you can do so with:git branch --set-upstream-to=origin/<branch> feature-1
      
    • 开发者A本地创建一个feature-2分支,并且和远端的feature-2分支关联起来
      $ git checkout -b feature-2 origin/feature-2
      Branch 'feature-2' set up to track remote branch 'feature-2' from 'origin'.
      Switched to a new branch 'feature-2'$ cat func2
      fun2 from B$ vim func2 # Coding...$ cat func2
      fun2 fron B
      fun2 Done from A$ git add .$ git commit -m "A edit func2 Done"
      [feature-2 2e279ac] A edit func2 Done1 file changed, 2 insertions(+), 1 deletion(-)$ git push origin feature-2
      Enumerating objects: 5, done.
      Counting objects: 100% (5/5), done.
      Delta compression using up to 20 threads
      Compressing objects: 100% (2/2), done.
      Writing objects: 100% (3/3), 280 bytes | 280.00 KiB/s, done.
      Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
      remote: Resolving deltas: 100% (1/1), completed with 1 local object.
      To github.com:DieSnowK/Git-Learn.git31c8cbb..2e279ac  feature-2 -> feature-2
      
  • 两人开发全部完毕后,都需要将各自的代码合并到main中才算真正的开发完毕,流程如下
    • 开发者A

      • 切换至maingit pull,保证本地main是最新内容

      • 切换至feature-1分支,合并main分支,有冲突就在feature-1分支解决

      • 切换至main分支,合并feature-1分支

      • main分支推送至远端
        请添加图片描述

        $ git checkout main
        Switched to branch 'main'
        Your branch is up to date with 'origin/main'.$ git pull
        Already up to date.$ git checkout feature-1
        Switched to branch 'feature-1'$ git merge main
        Already up to date.$ git checkout main
        Switched to branch 'main'
        Your branch is up to date with 'origin/main'.$ git merge feature-1
        Updating 10cd204..84e77e0
        Fast-forwardfunc1 | 1 +1 file changed, 1 insertion(+)create mode 100644 func1$ cat func1
        fun1 from A$ git push
        Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
        To github.com:DieSnowK/Git-Learn.git10cd204..84e77e0  main -> main
        
    • 开发者B

      • 切换至maingit pull,保证本地main是最新内容

      • 切换至feature-2分支,合并main分支,有冲突就在feature-2分支解决

      • 由于feature-1分支已经merge进来了新内容,为了保证feature-2远程分支最新,最好在此时git push一下

        • git push的另一个原因是在实际的开发中,mainmerge操作⼀般不是由我们⾃⼰在本地进进行,而是由审查人员进行
        • 其他⼈员或某些平台merge时,操作的肯定是远程分⽀,所以就要保证远程分⽀的最新
        • 如果此时merge发生冲突,解决完冲突后需要commit之后才能push
      • 切换至main分支,合并feature-2分支

      • main分支推送至远端
        请添加图片描述

        $ git checkout main
        Switched to branch 'main'
        Your branch is up to date with 'origin/main'.$ git pull
        Already up to date.$ git checkout feature-2
        Switched to branch 'feature-2'
        Your branch is up to date with 'origin/feature-2'.$ git merge main
        Merge made by the 'ort' strategy.func1 | 1 +1 file changed, 1 insertion(+)create mode 100644 func1$ ls
        SnowK.txt  func1  func2$ git status
        On branch feature-2
        Your branch is ahead of 'origin/feature-2' by 2 commits.(use "git push" to publish your local commits)nothing to commit, working tree clean$ git push
        Enumerating objects: 4, done.
        Counting objects: 100% (4/4), done.
        Delta compression using up to 20 threads
        Compressing objects: 100% (2/2), done.
        Writing objects: 100% (2/2), 292 bytes | 292.00 KiB/s, done.
        Total 2 (delta 1), reused 0 (delta 0), pack-reused 0
        remote: Resolving deltas: 100% (1/1), completed with 1 local object.
        To github.com:DieSnowK/Git-Learn.git2e279ac..2250eeb  feature-2 -> feature-2$ git checkout main
        Switched to branch 'main'
        Your branch is up to date with 'origin/main'.$ git merge feature-2
        Updating 84e77e0..2250eeb
        Fast-forwardfunc2 | 2 ++1 file changed, 2 insertions(+)create mode 100644 func2$ ls
        SnowK.txt  func1  func2$ git push
        Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
        To github.com:DieSnowK/Git-Learn.git84e77e0..2250eeb  main -> main
        
  • 至此,无论本地还是远端的feature-1feature-2分支都没用了,可以直接删掉了

git_branch_a_226">2.远程分⽀删除后,本地git branch -a依然能看到

  • 问题描述:明明已经删除了远程的⼏个分⽀,但使⽤git branch -a发现很多在远程仓库已经删除的分⽀在本地依然可以看到
  • 问题追溯git remote show origin
    $ git remote show origin
    * remote originFetch URL: git@github.com:DieSnowK/Git-Learn.gitPush  URL: git@github.com:DieSnowK/Git-Learn.gitHEAD branch: mainRemote branches:main                     trackedrefs/remotes/origin/dev  stale (use 'git remote prune' to remove)refs/remotes/origin/test stale (use 'git remote prune' to remove)Local branch configured for 'git pull':main merges with remote mainLocal ref configured for 'git push':main pushes to main (up to date)
    
  • 解决方案:使用git remote prune origin命令
    $ git remote prune origin
    Pruning origin
    URL: git@github.com:DieSnowK/Git-Learn.git* [pruned] origin/dev* [pruned] origin/test
    

http://www.ppmy.cn/embedded/92331.html

相关文章

科普文:万字细说微服务及其框架Netflix,Spring Cloud,Spring Cloud Alibaba梳理

概叙 微服务&#xff08;Microservices&#xff09;是一种软件架构风格&#xff0c;它将单一的应用程序拆分为多个小的服务&#xff0c;每个服务都是独立运行和部署的。每个微服务通常只专注于一个业务功能&#xff0c;具有自己的数据存储&#xff0c;并且通过轻量级的通信机制…

线性代数课程介绍

一、课程概述 线性代数课程内容丰富&#xff0c;主要围绕向量、矩阵和线性变换等核心概念展开&#xff0c;旨在培养学生的空间直观和想象能力、抽象思维和逻辑推理能力。线性代数是理工科大学生必修的数学基础课之一&#xff0c;也是硕士研究生入学全国统一考试中必考的数学…

Ubuntu文件操作(文件系统结构、磁盘管理)

一、文件系统结构 1、根目录“/” 根目录&#xff08;Root Directory&#xff09;是计算机文件系统中的顶级目录&#xff0c;位于文件系统的树形结构的最上层。在Linux系统中&#xff0c;根目录的路径是“/”&#xff0c;是整个文件系统的起始点。所有的目录都是由根目录衍生…

「测试线排查的一些经验-上篇」 后端工程师

文章目录 端口占用脚本失灵线上部署项目结构模版配置文件生效 一般产品研发过程所使用的环境可分为&#xff1a; 研发环境-dev测试环境-test生产环境-prod 软件开发中&#xff0c;完整测试环境包括&#xff1a;UT、IT、ST、UAT UT Unit Test 单元测试 IT System Integration …

虚拟机Windows10系统安装QEMU

文章目录 1. QEMU安装1.1 安装准备1.1.1 安装平台1.1.2 软件下载 1.2 安装QEMU1.2.1 找到下载的QEMU软件&#xff0c;双击开始安装1.2.2 设置语言1.2.3 安装向导&#xff0c;点击 Next1.2.4 点击“I Agree”1.2.5 点击Next1.2.6 设置软件安装位置1.2.7 点击 finish1.2.8 编辑系…

JavaDS —— 红黑树

前言 还是一样&#xff0c;这里的红黑树重点讲述插入代码的实现&#xff0c;如果对红黑树的删除感兴趣&#xff0c;可以去翻阅其他资料。 在数据结构专栏中已经对 AVL 树的旋转调整做了分析和讲解&#xff0c;这里红黑树也会使用到旋转调整的代码&#xff0c;就不讲述旋转代码…

AI称重收银一体秤

系统介绍 专门为零售行业的连锁店量身打造的收银系统&#xff0c;适用于常规超市、生鲜超市、水果店、便利店、零食专卖店、服装店、母婴用品、农贸市场等类型的门店使用。同时线上线下数据打通&#xff0c;线下收银的数据与小程序私域商城中的数据完全同步&#xff0c;如商品…

Flink开发语言使用Java还是Scala合适?

Flink 是一个用于处理分布式数据流和批处理数据的开源框架。它可以在大规模数据上进行实时和批量处理&#xff0c;具有高吞吐量、低延迟和容错能力。Flink 最常用于以下几种场景&#xff1a; 实时数据流处理&#xff1a;Flink 专为流处理而设计&#xff0c;可以处理无界数据流…