我有两个分支:师父和布兰克2。
它们仅在一行上有所不同,以供评论:
师父有意见://test 00
branch2有注释://test 99
假设我从branch2开始并合并到master,那行是不是
//test 00或//test 99?当我尝试使用git bash时,它返回消息“merge maked by the‘recursive’strategy”,但实际上它并没有显示更改。
PS C:\Node\projects\n-5-10-workflow-test> git checkout branch2
Switched to branch 'branch2'
PS C:\Node\projects\n-5-10-workflow-test> git status
On branch branch2
nothing to commit, working tree clean
PS C:\Node\projects\n-5-10-workflow-test> git remote show origin
* remote origin
Fetch URL: https://github.com/masterinex/workflow.git
Push URL: https://github.com/masterinex/workflow.git
HEAD branch: master
Remote branches:
branch2 tracked
master tracked
Local branch configured for 'git pull':
master merges with remote master
Local refs configured for 'git push':
branch2 pushes to branch2 (fast-forwardable)
master pushes to master (up to date)
PS C:\Node\projects\n-5-10-workflow-test> git status
On branch branch2
nothing to commit, working tree clean
PS C:\Node\projects\n-5-10-workflow-test> git branch -a
* branch2
master
remotes/heroku/master
remotes/origin/branch2
remotes/origin/master
PS C:\Node\projects\n-5-10-workflow-test> git merge master
Merge made by the 'recursive' strategy.
PS C:\Node\projects\n-5-10-workflow-test>
