ICode9

精准搜索请尝试: 精确搜索
首页 > 其他分享> 文章详细

git 红色标出没明白

2021-02-05 18:03:49  阅读:237  来源: 互联网

标签:git 标出 RuoYi kjfwpt job 红色 MINGW64 hotfix



Dell@zhanxuPC MINGW64 /f/fingerTip/job.kjfwpt.com/RuoYi-ibaiqi-job (hotfix-ui
$ git  status
On branch hotfix-ui
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   ruoyi-admin/src/main/resources/templates/login.html

no changes added to commit (use "git add" and/or "git commit -a")

Dell@zhanxuPC MINGW64 /f/fingerTip/job.kjfwpt.com/RuoYi-ibaiqi-job (hotfix-ui
$ git add .

Dell@zhanxuPC MINGW64 /f/fingerTip/job.kjfwpt.com/RuoYi-ibaiqi-job (hotfix-ui
$ git commit
[hotfix-ui 0eeff57] 修改merge合并冲突
 1 file changed, 4 deletions(-)

Dell@zhanxuPC MINGW64 /f/fingerTip/job.kjfwpt.com/RuoYi-ibaiqi-job (hotfix-ui
$ git branch -a
  develop
  feather-recruit
  feather-resume
  feather-ui
* hotfix-ui
  master
  release0.0.1
  remotes/origin/HEAD -> origin/master
  remotes/origin/master

Dell@zhanxuPC MINGW64 /f/fingerTip/job.kjfwpt.com/RuoYi-ibaiqi-job (hotfix-ui
$ git switch develop
Switched to branch 'develop'

Dell@zhanxuPC MINGW64 /f/fingerTip/job.kjfwpt.com/RuoYi-ibaiqi-job (develop)
$ git merge release0.0.1
Already up to date.

Dell@zhanxuPC MINGW64 /f/fingerTip/job.kjfwpt.com/RuoYi-ibaiqi-job (develop)
$ git switch master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 23 commits.
  (use "git push" to publish your local commits)

Dell@zhanxuPC MINGW64 /f/fingerTip/job.kjfwpt.com/RuoYi-ibaiqi-job (master)
$

标签:git,标出,RuoYi,kjfwpt,job,红色,MINGW64,hotfix
来源: https://www.cnblogs.com/asplover/p/14379122.html

本站声明: 1. iCode9 技术分享网(下文简称本站)提供的所有内容,仅供技术学习、探讨和分享;
2. 关于本站的所有留言、评论、转载及引用,纯属内容发起人的个人观点,与本站观点和立场无关;
3. 关于本站的所有言论和文字,纯属内容发起人的个人观点,与本站观点和立场无关;
4. 本站文章均是网友提供,不完全保证技术分享内容的完整性、准确性、时效性、风险性和版权归属;如您发现该文章侵犯了您的权益,可联系我们第一时间进行删除;
5. 本站为非盈利性的个人网站,所有内容不会用来进行牟利,也不会利用任何形式的广告来间接获益,纯粹是为了广大技术爱好者提供技术内容和技术思想的分享性交流网站。

专注分享技术,共同学习,共同进步。侵权联系[81616952@qq.com]

Copyright (C)ICode9.com, All Rights Reserved.

ICode9版权所有