zoukankan      html  css  js  c++  java
  • Git 分支 主干

    ~/Desktop/work/movies/movie(apps) $ git status  //先查看是否有需要提交的东西
    # On branch apps
    nothing to commit (working directory clean)
    ~/Desktop/work/movies/movie(apps) $ git checkout master //切换到主干
    Switched to branch 'master'
    ~/Desktop/work/movies/movie(master) $ git status  //查看主干是否有需要提交的东西
    # On branch master
    nothing to commit (working directory clean)
    ~/Desktop/work/movies/movie(master) $ git pull  //再次确认是否需要更新代码查看主干是否有需要提交的东西
    Already up-to-date.

    ~/Desktop/work/movies/movie(master) $ git checkout apps //切换到分支

    Switched to branch 'apps'

    ~/Desktop/work/movies/movie(apps) $ git rebase master//拷贝主干最新内容
    Current branch apps is up to date.
    ~/Desktop/work/movies/movie(apps) $ git checkout master //切换到主干
    Switched to branch 'master'

    ~/Desktop/work/movies/movie(master) $ git merge apps //合并分支
    Updating e6ba441..9bc179d
    Fast-forward
     .../Classes/UI/Film/FilmListController.m           |    4 +++-
     1 files changed, 3 insertions(+), 1 deletions(-)
    ~/Desktop/work/movies/movie(master) $ git branch
      apps
    * master
    ~/Desktop/work/movies/movie(master) $ git apps
    git: 'apps' is not a git command. See 'git --help'.


    Did you mean this?
    apply
    ~/Desktop/work/movies/movie(master) $ git checkout apps
    Switched to branch 'apps'
    ~/Desktop/work/movies/movie(apps) $ 

     
     
     
     
     
    让明天,不后悔今天的所作所为
  • 相关阅读:
    垃圾收集器
    垃圾收集算法
    动态绑定
    数据库连接池原理
    分布式事务:两段式提交(最终一致性)
    C# 推箱子游戏&对战游戏
    C# 结构体和类的区别
    C# 类&结构体&枚举
    C# 哈希表&列队&栈
    C# 数组&集合&泛型集合
  • 原文地址:https://www.cnblogs.com/-yun/p/4794973.html
Copyright © 2011-2022 走看看