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)
$